122188 2013-10-01 15:25:42 -0700 Clean up more <style scoped> from style resolution 2013-10-02 12:54:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin allan.jensen commit-queue esprehn+autocc glenn kangil.han macpherson menard oldest_to_newest 935231 0 benjamin 2013-10-01 15:25:42 -0700 Clean up more <style scoped> from style resolution 935233 1 213126 benjamin 2013-10-01 15:27:03 -0700 Created attachment 213126 Patch 935500 2 213126 benjamin 2013-10-02 12:54:33 -0700 Comment on attachment 213126 Patch Clearing flags on attachment: 213126 Committed r156788: <http://trac.webkit.org/changeset/156788> 935501 3 benjamin 2013-10-02 12:54:35 -0700 All reviewed patches have been landed. Closing bug. 213126 2013-10-01 15:27:03 -0700 2013-10-02 12:54:32 -0700 Patch bug-122188-20131001152702.patch text/plain 12276 benjamin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjczNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEzLTEwLTAxICBCZW5qYW1p biBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVhbiB1cCBtb3Jl IDxzdHlsZSBzY29wZWQ+IGZyb20gc3R5bGUgcmVzb2x1dGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyMTg4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3Iu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TWF0Y2hSZXF1ZXN0OjpNYXRjaFJlcXVlc3QpOgorICAg ICAgICAoV2ViQ29yZTo6RWxlbWVudFJ1bGVDb2xsZWN0b3I6OmNvbGxlY3RNYXRjaGluZ1J1bGVz KToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRSdWxlQ29sbGVjdG9yOjpjb2xsZWN0TWF0Y2hp bmdSdWxlc0ZvclJlZ2lvbik6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50UnVsZUNvbGxlY3Rv cjo6bWF0Y2hBdXRob3JSdWxlcyk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50UnVsZUNvbGxl Y3Rvcjo6cnVsZU1hdGNoZXMpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudFJ1bGVDb2xsZWN0 b3I6OmRvQ29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KToKKyAgICAgICAgKiBjc3MvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuaDoKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6bWF0Y2hSZWN1cnNpdmVseSk6CisgICAg ICAgICogY3NzL1NlbGVjdG9yQ2hlY2tlci5oOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JD aGVja2VyOjpTZWxlY3RvckNoZWNraW5nQ29udGV4dDo6U2VsZWN0b3JDaGVja2luZ0NvbnRleHQp OgorICAgICAgICAqIGRvbS9TZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNl bGVjdG9yRGF0YUxpc3Q6OnNlbGVjdG9yTWF0Y2hlcyk6CisKIDIwMTMtMTAtMDEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ2xlYW51cCBEb2N1bWVudDo6ZGlz cGF0Y2hGdWxsU2NyZWVuQ2hhbmdlT3JFcnJvckV2ZW50CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAJKHJldmlzaW9uIDE1NjczMykKKysrIFNvdXJj ZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTY1LDE1ICs2NSwxMyBAQCBzdGF0aWMgY29uc3QgU3R5bGVQcm9wZXJ0eVNldCYgcmlnaHRUb0xl CiAKIGNsYXNzIE1hdGNoUmVxdWVzdCB7CiBwdWJsaWM6Ci0gICAgTWF0Y2hSZXF1ZXN0KFJ1bGVT ZXQqIHJ1bGVTZXQsIGJvb2wgaW5jbHVkZUVtcHR5UnVsZXMgPSBmYWxzZSwgY29uc3QgQ29udGFp bmVyTm9kZSogc2NvcGUgPSAwKQorICAgIE1hdGNoUmVxdWVzdChSdWxlU2V0KiBydWxlU2V0LCBi b29sIGluY2x1ZGVFbXB0eVJ1bGVzID0gZmFsc2UpCiAgICAgICAgIDogcnVsZVNldChydWxlU2V0 KQogICAgICAgICAsIGluY2x1ZGVFbXB0eVJ1bGVzKGluY2x1ZGVFbXB0eVJ1bGVzKQotICAgICAg ICAsIHNjb3BlKHNjb3BlKQogICAgIHsKICAgICB9CiAgICAgY29uc3QgUnVsZVNldCogcnVsZVNl dDsKICAgICBjb25zdCBib29sIGluY2x1ZGVFbXB0eVJ1bGVzOwotICAgIGNvbnN0IENvbnRhaW5l ck5vZGUqIHNjb3BlOwogfTsKIAogU3R5bGVSZXNvbHZlcjo6TWF0Y2hSZXN1bHQmIEVsZW1lbnRS dWxlQ29sbGVjdG9yOjptYXRjaGVkUmVzdWx0KCkKQEAgLTE2Nyw4ICsxNjUsNyBAQCB2b2lkIEVs ZW1lbnRSdWxlQ29sbGVjdG9yOjpjb2xsZWN0TWF0Y2hpCiAgICAgLy8gYykgdGhlIHJ1bGVzIGNv bWVzIGZyb20gYSBzY29wZWQgc3R5bGUgc2hlZXQgd2l0aGluIHRoZSBzYW1lIHRyZWUgc2NvcGUK ICAgICBUcmVlU2NvcGUqIHRyZWVTY29wZSA9IGVsZW1lbnQtPnRyZWVTY29wZSgpOwogICAgIGlm ICghTWF0Y2hpbmdVQVJ1bGVzU2NvcGU6OmlzTWF0Y2hpbmdVQVJ1bGVzKCkKLSAgICAgICAgJiYg IXRyZWVTY29wZS0+YXBwbHlBdXRob3JTdHlsZXMoKQotICAgICAgICAmJiAoIW1hdGNoUmVxdWVz dC5zY29wZSB8fCBtYXRjaFJlcXVlc3Quc2NvcGUtPnRyZWVTY29wZSgpICE9IHRyZWVTY29wZSkp CisgICAgICAgICYmICF0cmVlU2NvcGUtPmFwcGx5QXV0aG9yU3R5bGVzKCkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIC8vIFdlIG5lZWQgdG8gY29sbGVjdCB0aGUgcnVsZXMgZm9yIGlkLCBjbGFz cywgdGFnLCBhbmQgZXZlcnl0aGluZyBlbHNlIGludG8gYSBidWZmZXIgYW5kCkBAIC0xOTksNyAr MTk2LDcgQEAgdm9pZCBFbGVtZW50UnVsZUNvbGxlY3Rvcjo6Y29sbGVjdE1hdGNoaQogICAgICAg ICBpZiAoY2hlY2tSZWdpb25TZWxlY3RvcihyZWdpb25TZWxlY3RvciwgbV9yZWdpb25Gb3JTdHls aW5nLT5nZW5lcmF0aW5nRWxlbWVudCgpKSkgewogICAgICAgICAgICAgUnVsZVNldCogcmVnaW9u UnVsZXMgPSBtYXRjaFJlcXVlc3QucnVsZVNldC0+cmVnaW9uU2VsZWN0b3JzQW5kUnVsZVNldHMo KS5hdChpKS5ydWxlU2V0LmdldCgpOwogICAgICAgICAgICAgQVNTRVJUKHJlZ2lvblJ1bGVzKTsK LSAgICAgICAgICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzKE1hdGNoUmVxdWVzdChyZWdpb25SdWxl cywgbWF0Y2hSZXF1ZXN0LmluY2x1ZGVFbXB0eVJ1bGVzLCBtYXRjaFJlcXVlc3Quc2NvcGUpLCBy dWxlUmFuZ2UpOworICAgICAgICAgICAgY29sbGVjdE1hdGNoaW5nUnVsZXMoTWF0Y2hSZXF1ZXN0 KHJlZ2lvblJ1bGVzLCBtYXRjaFJlcXVlc3QuaW5jbHVkZUVtcHR5UnVsZXMpLCBydWxlUmFuZ2Up OwogICAgICAgICB9CiAgICAgfQogfQpAQCAtMjI4LDY4ICsyMjUsNiBAQCB2b2lkIEVsZW1lbnRS dWxlQ29sbGVjdG9yOjpzb3J0QW5kVHJhbnNmCiAgICAgfQogfQogCi12b2lkIEVsZW1lbnRSdWxl Q29sbGVjdG9yOjptYXRjaFNjb3BlZEF1dGhvclJ1bGVzKGJvb2wgaW5jbHVkZUVtcHR5UnVsZXMp Ci17Ci0jaWYgRU5BQkxFKFNIQURPV19ET00pCi0gICAgaWYgKCFtX3Njb3BlUmVzb2x2ZXIpCi0g ICAgICAgIHJldHVybjsKLQotICAgIC8vIE1hdGNoIHNjb3BlZCBhdXRob3IgcnVsZXMgYnkgdHJh dmVyc2luZyB0aGUgc2NvcGVkIGVsZW1lbnQgc3RhY2sgKHJlYnVpbGQgaXQgaWYgaXQgZ290IGlu Y29uc2lzdGVudCkuCi0gICAgaWYgKG1fc2NvcGVSZXNvbHZlci0+aGFzU2NvcGVkU3R5bGVzKCkg JiYgbV9zY29wZVJlc29sdmVyLT5lbnN1cmVTdGFja0NvbnNpc3RlbmN5KG1fc3RhdGUuZWxlbWVu dCgpKSkgewotICAgICAgICBib29sIGFwcGx5QXV0aG9yU3R5bGVzID0gbV9zdGF0ZS5lbGVtZW50 KCktPnRyZWVTY29wZSgpLT5hcHBseUF1dGhvclN0eWxlcygpOwotICAgICAgICBib29sIGRvY3Vt ZW50U2NvcGUgPSB0cnVlOwotICAgICAgICB1bnNpZ25lZCBzY29wZVNpemUgPSBtX3Njb3BlUmVz b2x2ZXItPnN0YWNrU2l6ZSgpOwotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2Nv cGVTaXplOyArK2kpIHsKLSAgICAgICAgICAgIGNsZWFyTWF0Y2hlZFJ1bGVzKCk7Ci0gICAgICAg ICAgICBtX3Jlc3VsdC5yYW5nZXMubGFzdEF1dGhvclJ1bGUgPSBtX3Jlc3VsdC5tYXRjaGVkUHJv cGVydGllcy5zaXplKCkgLSAxOwotCi0gICAgICAgICAgICBjb25zdCBTdHlsZVNjb3BlUmVzb2x2 ZXI6OlN0YWNrRnJhbWUmIGZyYW1lID0gbV9zY29wZVJlc29sdmVyLT5zdGFja0ZyYW1lQXQoaSk7 Ci0gICAgICAgICAgICBkb2N1bWVudFNjb3BlID0gZG9jdW1lbnRTY29wZSAmJiAhZnJhbWUubV9z Y29wZS0+aXNJblNoYWRvd1RyZWUoKTsKLSAgICAgICAgICAgIGlmIChkb2N1bWVudFNjb3BlKSB7 Ci0gICAgICAgICAgICAgICAgaWYgKCFhcHBseUF1dGhvclN0eWxlcykKLSAgICAgICAgICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGlm ICghbV9zY29wZVJlc29sdmVyLT5tYXRjaGVzU3R5bGVCb3VuZHMoZnJhbWUpKQotICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgTWF0Y2hS ZXF1ZXN0IG1hdGNoUmVxdWVzdChmcmFtZS5tX3J1bGVTZXQsIGluY2x1ZGVFbXB0eVJ1bGVzLCBm cmFtZS5tX3Njb3BlKTsKLSAgICAgICAgICAgIFN0eWxlUmVzb2x2ZXI6OlJ1bGVSYW5nZSBydWxl UmFuZ2UgPSBtX3Jlc3VsdC5yYW5nZXMuYXV0aG9yUnVsZVJhbmdlKCk7Ci0gICAgICAgICAgICBj b2xsZWN0TWF0Y2hpbmdSdWxlcyhtYXRjaFJlcXVlc3QsIHJ1bGVSYW5nZSk7Ci0gICAgICAgICAg ICBjb2xsZWN0TWF0Y2hpbmdSdWxlc0ZvclJlZ2lvbihtYXRjaFJlcXVlc3QsIHJ1bGVSYW5nZSk7 Ci0gICAgICAgICAgICBzb3J0QW5kVHJhbnNmZXJNYXRjaGVkUnVsZXMoKTsKLSAgICAgICAgfQot ICAgIH0KLQotICAgIG1hdGNoSG9zdFJ1bGVzKGluY2x1ZGVFbXB0eVJ1bGVzKTsKLSNlbHNlCi0g ICAgVU5VU0VEX1BBUkFNKGluY2x1ZGVFbXB0eVJ1bGVzKTsKLSNlbmRpZgotfQotCi12b2lkIEVs ZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRjaEhvc3RSdWxlcyhib29sIGluY2x1ZGVFbXB0eVJ1bGVz KQotewotI2lmIEVOQUJMRShTSEFET1dfRE9NKQotICAgIEFTU0VSVChtX3Njb3BlUmVzb2x2ZXIp OwotCi0gICAgY2xlYXJNYXRjaGVkUnVsZXMoKTsKLSAgICBtX3Jlc3VsdC5yYW5nZXMubGFzdEF1 dGhvclJ1bGUgPSBtX3Jlc3VsdC5tYXRjaGVkUHJvcGVydGllcy5zaXplKCkgLSAxOwotCi0gICAg VmVjdG9yPFJ1bGVTZXQqPiBtYXRjaGVkUnVsZXM7Ci0gICAgbV9zY29wZVJlc29sdmVyLT5tYXRj aEhvc3RSdWxlcyhtX3N0YXRlLmVsZW1lbnQoKSwgbWF0Y2hlZFJ1bGVzKTsKLSAgICBpZiAobWF0 Y2hlZFJ1bGVzLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZm9yICh1bnNpZ25l ZCBpID0gbWF0Y2hlZFJ1bGVzLnNpemUoKTsgaSA+IDA7IC0taSkgewotICAgICAgICBTdHlsZVJl c29sdmVyOjpSdWxlUmFuZ2UgcnVsZVJhbmdlID0gbV9yZXN1bHQucmFuZ2VzLmF1dGhvclJ1bGVS YW5nZSgpOwotICAgICAgICBjb2xsZWN0TWF0Y2hpbmdSdWxlcyhNYXRjaFJlcXVlc3QobWF0Y2hl ZFJ1bGVzLmF0KGktMSksIGluY2x1ZGVFbXB0eVJ1bGVzLCBtX3N0YXRlLmVsZW1lbnQoKSksIHJ1 bGVSYW5nZSk7Ci0gICAgfQotICAgIHNvcnRBbmRUcmFuc2Zlck1hdGNoZWRSdWxlcygpOwotI2Vs c2UKLSAgICBVTlVTRURfUEFSQU0oaW5jbHVkZUVtcHR5UnVsZXMpOwotI2VuZGlmCi19Ci0KIHZv aWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6Om1hdGNoQXV0aG9yUnVsZXMoYm9vbCBpbmNsdWRlRW1w dHlSdWxlcykKIHsKICAgICBjbGVhck1hdGNoZWRSdWxlcygpOwpAQCAtMzA1LDggKzI0MCw2IEBA IHZvaWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6Om1hdGNoQXV0aG9yUnUKICAgICBjb2xsZWN0TWF0 Y2hpbmdSdWxlc0ZvclJlZ2lvbihtYXRjaFJlcXVlc3QsIHJ1bGVSYW5nZSk7CiAKICAgICBzb3J0 QW5kVHJhbnNmZXJNYXRjaGVkUnVsZXMoKTsKLQotICAgIG1hdGNoU2NvcGVkQXV0aG9yUnVsZXMo aW5jbHVkZUVtcHR5UnVsZXMpOwogfQogCiB2b2lkIEVsZW1lbnRSdWxlQ29sbGVjdG9yOjptYXRj aFVzZXJSdWxlcyhib29sIGluY2x1ZGVFbXB0eVJ1bGVzKQpAQCAtMzU2LDcgKzI4OSw3IEBAIHZv aWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6Om1hdGNoVUFSdWxlcygKICAgICBzb3J0QW5kVHJhbnNm ZXJNYXRjaGVkUnVsZXMoKTsKIH0KIAotaW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6 OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSwgY29uc3QgQ29udGFpbmVyTm9k ZSogc2NvcGUsIFBzZXVkb0lkJiBkeW5hbWljUHNldWRvKQoraW5saW5lIGJvb2wgRWxlbWVudFJ1 bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSwgUHNldWRv SWQmIGR5bmFtaWNQc2V1ZG8pCiB7CiAgICAgY29uc3QgU3R5bGVSZXNvbHZlcjo6U3RhdGUmIHN0 YXRlID0gbV9zdGF0ZTsKIApAQCAtMzgzLDcgKzMxNiw2IEBAIGlubGluZSBib29sIEVsZW1lbnRS dWxlQ29sbGVjdG9yOjpydWxlTWEKICAgICBTZWxlY3RvckNoZWNrZXIgc2VsZWN0b3JDaGVja2Vy KGRvY3VtZW50KCksIG1fbW9kZSk7CiAgICAgU2VsZWN0b3JDaGVja2VyOjpTZWxlY3RvckNoZWNr aW5nQ29udGV4dCBjb250ZXh0KHJ1bGVEYXRhLnNlbGVjdG9yKCksIHN0YXRlLmVsZW1lbnQoKSwg U2VsZWN0b3JDaGVja2VyOjpWaXNpdGVkTWF0Y2hFbmFibGVkKTsKICAgICBjb250ZXh0LmVsZW1l bnRTdHlsZSA9IHN0YXRlLnN0eWxlKCk7Ci0gICAgY29udGV4dC5zY29wZSA9IHNjb3BlOwogICAg IGNvbnRleHQucHNldWRvSWQgPSBtX3BzZXVkb1N0eWxlUmVxdWVzdC5wc2V1ZG9JZDsKICAgICBj b250ZXh0LnNjcm9sbGJhciA9IG1fcHNldWRvU3R5bGVSZXF1ZXN0LnNjcm9sbGJhcjsKICAgICBj b250ZXh0LnNjcm9sbGJhclBhcnQgPSBtX3BzZXVkb1N0eWxlUmVxdWVzdC5zY3JvbGxiYXJQYXJ0 OwpAQCAtNDIxLDcgKzM1Myw3IEBAIHZvaWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OmRvQ29sbGVj dE1hdGMKICAgICAgICAgaWYgKGhhc0luc3BlY3RvckZyb250ZW5kcykKICAgICAgICAgICAgIGNv b2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbE1hdGNoUnVsZSgmZG9jdW1lbnQo KSwgcnVsZSwgbV9pbnNwZWN0b3JDU1NPTVdyYXBwZXJzLCBkb2N1bWVudCgpLnN0eWxlU2hlZXRD b2xsZWN0aW9uKCkpOwogICAgICAgICBQc2V1ZG9JZCBkeW5hbWljUHNldWRvID0gTk9QU0VVRE87 Ci0gICAgICAgIGlmIChydWxlTWF0Y2hlcyhydWxlRGF0YSwgbWF0Y2hSZXF1ZXN0LnNjb3BlLCBk eW5hbWljUHNldWRvKSkgeworICAgICAgICBpZiAocnVsZU1hdGNoZXMocnVsZURhdGEsIGR5bmFt aWNQc2V1ZG8pKSB7CiAgICAgICAgICAgICAvLyBGb3IgU2hhcmluZ1J1bGVzIHRlc3RpbmcsIGFu eSBtYXRjaCBpcyBnb29kIGVub3VnaCwgd2UgZG9uJ3QgY2FyZSB3aGF0IGlzIG1hdGNoZWQuCiAg ICAgICAgICAgICBpZiAobV9tb2RlID09IFNlbGVjdG9yQ2hlY2tlcjo6U2hhcmluZ1J1bGVzKSB7 CiAgICAgICAgICAgICAgICAgYWRkTWF0Y2hlZFJ1bGUoJnJ1bGVEYXRhKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5oCShyZXZpc2lvbiAxNTY3MzMpCisr KyBTb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuaAkod29ya2luZyBjb3B5 KQpAQCAtNzYsMTMgKzc2LDExIEBAIHByaXZhdGU6CiAgICAgdm9pZCBhZGRFbGVtZW50U3R5bGVQ cm9wZXJ0aWVzKGNvbnN0IFN0eWxlUHJvcGVydHlTZXQqLCBib29sIGlzQ2FjaGVhYmxlID0gdHJ1 ZSk7CiAKICAgICB2b2lkIG1hdGNoVUFSdWxlcyhSdWxlU2V0Kik7Ci0gICAgdm9pZCBtYXRjaFNj b3BlZEF1dGhvclJ1bGVzKGJvb2wgaW5jbHVkZUVtcHR5UnVsZXMpOwotICAgIHZvaWQgbWF0Y2hI b3N0UnVsZXMoYm9vbCBpbmNsdWRlRW1wdHlSdWxlcyk7CiAKICAgICB2b2lkIGNvbGxlY3RNYXRj aGluZ1J1bGVzKGNvbnN0IE1hdGNoUmVxdWVzdCYsIFN0eWxlUmVzb2x2ZXI6OlJ1bGVSYW5nZSYp OwogICAgIHZvaWQgY29sbGVjdE1hdGNoaW5nUnVsZXNGb3JSZWdpb24oY29uc3QgTWF0Y2hSZXF1 ZXN0JiwgU3R5bGVSZXNvbHZlcjo6UnVsZVJhbmdlJik7CiAgICAgdm9pZCBjb2xsZWN0TWF0Y2hp bmdSdWxlc0Zvckxpc3QoY29uc3QgVmVjdG9yPFJ1bGVEYXRhPiosIGNvbnN0IE1hdGNoUmVxdWVz dCYsIFN0eWxlUmVzb2x2ZXI6OlJ1bGVSYW5nZSYpOwotICAgIGJvb2wgcnVsZU1hdGNoZXMoY29u c3QgUnVsZURhdGEmLCBjb25zdCBDb250YWluZXJOb2RlKiBzY29wZSwgUHNldWRvSWQmKTsKKyAg ICBib29sIHJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVEYXRhJiwgUHNldWRvSWQmKTsKIAogICAgIHZv aWQgc29ydE1hdGNoZWRSdWxlcygpOwogICAgIHZvaWQgc29ydEFuZFRyYW5zZmVyTWF0Y2hlZFJ1 bGVzKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcAkocmV2aXNp b24gMTU2NzMzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE4OSwxMCArMTg5LDYgQEAgU2VsZWN0b3JDaGVja2VyOjpNYXRjaCBT ZWxlY3RvckNoZWNrZXI6OgogCiAgICAgUHNldWRvSWQgaWdub3JlRHluYW1pY1BzZXVkbyA9IE5P UFNFVURPOwogICAgIGlmIChyZWxhdGlvbiAhPSBDU1NTZWxlY3Rvcjo6U3ViU2VsZWN0b3IpIHsK LSAgICAgICAgLy8gQWJvcnQgaWYgdGhlIG5leHQgc2VsZWN0b3Igd291bGQgZXhjZWVkIHRoZSBz Y29wZS4KLSAgICAgICAgaWYgKGNvbnRleHQuZWxlbWVudCA9PSBjb250ZXh0LnNjb3BlICYmIGNv bnRleHQuYmVoYXZpb3JBdEJvdW5kYXJ5ICE9IFN0YXlzV2l0aGluVHJlZVNjb3BlKQotICAgICAg ICAgICAgcmV0dXJuIFNlbGVjdG9yRmFpbHNDb21wbGV0ZWx5OwotCiAgICAgICAgIC8vIEJhaWwt b3V0IGlmIHRoaXMgc2VsZWN0b3IgaXMgaXJyZWxldmFudCBmb3IgdGhlIHBzZXVkb0lkCiAgICAg ICAgIGlmIChjb250ZXh0LnBzZXVkb0lkICE9IE5PUFNFVURPICYmIGNvbnRleHQucHNldWRvSWQg IT0gZHluYW1pY1BzZXVkbykKICAgICAgICAgICAgIHJldHVybiBTZWxlY3RvckZhaWxzQ29tcGxl dGVseTsKQEAgLTIxMyw4ICsyMDksNiBAQCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoIFNlbGVjdG9y Q2hlY2tlcjo6CiAgICAgICAgICAgICBNYXRjaCBtYXRjaCA9IHRoaXMtPm1hdGNoUmVjdXJzaXZl bHkobmV4dENvbnRleHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8pOwogICAgICAgICAgICAgaWYgKG1h dGNoID09IFNlbGVjdG9yTWF0Y2hlcyB8fCBtYXRjaCA9PSBTZWxlY3RvckZhaWxzQ29tcGxldGVs eSkKICAgICAgICAgICAgICAgICByZXR1cm4gbWF0Y2g7Ci0gICAgICAgICAgICBpZiAobmV4dENv bnRleHQuZWxlbWVudCA9PSBuZXh0Q29udGV4dC5zY29wZSAmJiBuZXh0Q29udGV4dC5iZWhhdmlv ckF0Qm91bmRhcnkgIT0gU3RheXNXaXRoaW5UcmVlU2NvcGUpCi0gICAgICAgICAgICAgICAgcmV0 dXJuIFNlbGVjdG9yRmFpbHNDb21wbGV0ZWx5OwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBT ZWxlY3RvckZhaWxzQ29tcGxldGVseTsKIApAQCAtMjY4LDkgKzI2Miw2IEBAIFNlbGVjdG9yQ2hl Y2tlcjo6TWF0Y2ggU2VsZWN0b3JDaGVja2VyOjoKIAogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OlNo YWRvd0Rlc2NlbmRhbnQ6CiAgICAgICAgIHsKLSAgICAgICAgICAgIC8vIElmIHdlJ3JlIGluIHRo ZSBzYW1lIHRyZWUtc2NvcGUgYXMgdGhlIHNjb3BpbmcgZWxlbWVudCwgdGhlbiBmb2xsb3dpbmcg YSBzaGFkb3cgZGVzY2VuZGFudCBjb21iaW5hdG9yIHdvdWxkIGVzY2FwZSB0aGF0IGFuZCB0aHVz IHRoZSBzY29wZS4KLSAgICAgICAgICAgIGlmIChjb250ZXh0LnNjb3BlICYmIGNvbnRleHQuc2Nv cGUtPnRyZWVTY29wZSgpID09IGNvbnRleHQuZWxlbWVudC0+dHJlZVNjb3BlKCkgJiYgY29udGV4 dC5iZWhhdmlvckF0Qm91bmRhcnkgIT0gU3RheXNXaXRoaW5UcmVlU2NvcGUpCi0gICAgICAgICAg ICAgICAgcmV0dXJuIFNlbGVjdG9yRmFpbHNDb21wbGV0ZWx5OwogICAgICAgICAgICAgRWxlbWVu dCogc2hhZG93SG9zdE5vZGUgPSBjb250ZXh0LmVsZW1lbnQtPnNoYWRvd0hvc3QoKTsKICAgICAg ICAgICAgIGlmICghc2hhZG93SG9zdE5vZGUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFNlbGVj dG9yRmFpbHNDb21wbGV0ZWx5OwpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hl Y2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIu aAkocmV2aXNpb24gMTU2NzMzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tl ci5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCw2IEBAIGNsYXNzIFNlbGVjdG9yQ2hlY2tl ciB7CiBwdWJsaWM6CiAgICAgZW51bSBWaXNpdGVkTWF0Y2hUeXBlIHsgVmlzaXRlZE1hdGNoRGlz YWJsZWQsIFZpc2l0ZWRNYXRjaEVuYWJsZWQgfTsKICAgICBlbnVtIE1vZGUgeyBSZXNvbHZpbmdT dHlsZSA9IDAsIENvbGxlY3RpbmdSdWxlcywgUXVlcnlpbmdSdWxlcywgU2hhcmluZ1J1bGVzIH07 Ci0gICAgZW51bSBCZWhhdmlvckF0Qm91bmRhcnkgeyBEb2VzTm90Q3Jvc3NCb3VuZGFyeSwgU3Rh eXNXaXRoaW5UcmVlU2NvcGUgfTsKIAogICAgIFNlbGVjdG9yQ2hlY2tlcihEb2N1bWVudCYsIE1v ZGUpOwogCkBAIC02Niw3ICs2NSw2IEBAIHB1YmxpYzoKICAgICAgICAgICAgICwgaXNTdWJTZWxl Y3RvcihmYWxzZSkKICAgICAgICAgICAgICwgaGFzU2Nyb2xsYmFyUHNldWRvKGZhbHNlKQogICAg ICAgICAgICAgLCBoYXNTZWxlY3Rpb25Qc2V1ZG8oZmFsc2UpCi0gICAgICAgICAgICAsIGJlaGF2 aW9yQXRCb3VuZGFyeShEb2VzTm90Q3Jvc3NCb3VuZGFyeSkKICAgICAgICAgeyB9CiAKICAgICAg ICAgY29uc3QgQ1NTU2VsZWN0b3IqIHNlbGVjdG9yOwpAQCAtODAsNyArNzgsNiBAQCBwdWJsaWM6 CiAgICAgICAgIGJvb2wgaXNTdWJTZWxlY3RvcjsKICAgICAgICAgYm9vbCBoYXNTY3JvbGxiYXJQ c2V1ZG87CiAgICAgICAgIGJvb2wgaGFzU2VsZWN0aW9uUHNldWRvOwotICAgICAgICBCZWhhdmlv ckF0Qm91bmRhcnkgYmVoYXZpb3JBdEJvdW5kYXJ5OwogICAgIH07CiAKICAgICBib29sIG1hdGNo KGNvbnN0IFNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0JiBjb250ZXh0LCBQc2V1ZG9JZCYgcHNldWRv SWQpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCShyZXZpc2lv biAxNTY3MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTYxLDcgKzYxLDYgQEAgaW5saW5lIGJvb2wgU2VsZWN0b3JEYXRhTGlzdDo6 c2VsZWN0b3JNYQogCiAgICAgU2VsZWN0b3JDaGVja2VyIHNlbGVjdG9yQ2hlY2tlcihlbGVtZW50 LT5kb2N1bWVudCgpLCBTZWxlY3RvckNoZWNrZXI6OlF1ZXJ5aW5nUnVsZXMpOwogICAgIFNlbGVj dG9yQ2hlY2tlcjo6U2VsZWN0b3JDaGVja2luZ0NvbnRleHQgc2VsZWN0b3JDaGVja2luZ0NvbnRl eHQoc2VsZWN0b3JEYXRhLnNlbGVjdG9yLCBlbGVtZW50LCBTZWxlY3RvckNoZWNrZXI6OlZpc2l0 ZWRNYXRjaERpc2FibGVkKTsKLSAgICBzZWxlY3RvckNoZWNraW5nQ29udGV4dC5iZWhhdmlvckF0 Qm91bmRhcnkgPSBTZWxlY3RvckNoZWNrZXI6OlN0YXlzV2l0aGluVHJlZVNjb3BlOwogICAgIHNl bGVjdG9yQ2hlY2tpbmdDb250ZXh0LnNjb3BlID0gIXJvb3ROb2RlLT5pc0RvY3VtZW50Tm9kZSgp ICYmIHJvb3ROb2RlLT5pc0NvbnRhaW5lck5vZGUoKSA/IHRvQ29udGFpbmVyTm9kZShyb290Tm9k ZSkgOiAwOwogICAgIFBzZXVkb0lkIGlnbm9yZUR5bmFtaWNQc2V1ZG8gPSBOT1BTRVVETzsKICAg ICByZXR1cm4gc2VsZWN0b3JDaGVja2VyLm1hdGNoKHNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0LCBp Z25vcmVEeW5hbWljUHNldWRvKTsK