199052 2019-06-19 18:35:17 -0700 Web Inspector: Edit -> Tag doesn't do anything for html, head, and body elements 2019-06-20 15:45:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev hi commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1546358 0 nvasilyev 2019-06-19 18:35:17 -0700 Steps: 1. Open https://webkit.org 2. Inspect <body> 3. Right click on <body> 4. Select "Edit -> Tag" Actual: Nothing happens. Expected: Either start editing "body" or disable (gray out) the "Tag" menu item. 1546360 1 webkit-bug-importer 2019-06-19 18:40:16 -0700 <rdar://problem/51923906> 1546564 2 372566 hi 2019-06-20 10:24:24 -0700 Created attachment 372566 Patch 1546632 3 372566 mattbaker 2019-06-20 13:21:28 -0700 Comment on attachment 372566 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372566&action=review r=me > Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js:801 > + if (!DOMTreeElement.EditTagBlacklist.has(this.representedObject.nodeNameInCorrectCase())) { Nit: I'd move `let tagNameNode = event.target.closest(".html-tag-name");` (line 746 above) to here to where it is used. 1546681 4 372591 hi 2019-06-20 15:12:20 -0700 Created attachment 372591 Patch 1546701 5 372591 commit-queue 2019-06-20 15:45:23 -0700 Comment on attachment 372591 Patch Clearing flags on attachment: 372591 Committed r246658: <https://trac.webkit.org/changeset/246658> 1546702 6 commit-queue 2019-06-20 15:45:24 -0700 All reviewed patches have been landed. Closing bug. 372566 2019-06-20 10:24:24 -0700 2019-06-20 15:12:18 -0700 Patch bug-199052-20190620102423.patch text/plain 5482 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDYxMTVlNjg0Njk5YTcwNGZjNzdjZGZmOWEzMWQ0 OTI2ZjFjNmI5YzQuLjlkYTE4ODdmODJhNmVlYzEwNzdlY2E1MWQ5YmViOTM1MDQ1NDUyMjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA2LTIwICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF ZGl0IC0+IFRhZyBkb2Vzbid0IGRvIGFueXRoaW5nIGZvciBodG1sLCBoZWFkLCBhbmQgYm9keSBl bGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk5MDUyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MTkyMzkwNj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUu cG9wdWxhdGVET01Ob2RlQ29udGV4dE1lbnUpOgorICAgICAgICAgLSBEb24ndCBzaG93IGFuICJF ZGl0ID4gVGFnIiBmb3IgPGh0bWw+LCA8aGVhZD4sIGFuZCA8Ym9keT4gbm9kZXMKKyAgICAgICAg IC0gRGlzYWJsZSBhbnkgIkVkaXQiIHN1Ym1lbnUgaXRlbSBpZiBpdCdzIHRhcmdldCBpcyBhbHJl YWR5IGJlaW5nIGVkaXRlZAorICAgICAgICAgLSBQcmV2ZW50ICJBZGQiIHN1Ym1lbnUgaXRlbXMg ZnJvbSBiZWluZyBzaG93biBmb3IgdGV4dCBub2RlcworCiAyMDE5LTA2LTE5ICBEZXZpbiBSb3Vz c28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBVbmNhdWdo dCBFeGNlcHRpb246IFR5cGVFcnJvcjogdW5kZWZpbmVkIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1 YXRpbmcgJ3NvdXJjZUNvZGVQb3NpdGlvbi5saW5lTnVtYmVyJykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQu anMKaW5kZXggYWViZmYwM2ExY2FhMWViNWFlMDgyNzYyNDZiNzE1MDJkYmRjYjIxNS4uMTRmZjI0 MDFmZWVmZWQ0NDk1NzAzZmFkMjNjMzRmY2RjMjhiZTQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQu anMKQEAgLTc0MywxMiArNzQzLDEzIEBAIFdJLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJl ZUVsZW1lbnQgZXh0ZW5kcyBXSS5UcmVlRWxlbWVudAogCiAgICAgcG9wdWxhdGVET01Ob2RlQ29u dGV4dE1lbnUoY29udGV4dE1lbnUsIHN1Yk1lbnVzLCBldmVudCkKICAgICB7Ci0gICAgICAgIGxl dCBhdHRyaWJ1dGUgPSBldmVudC50YXJnZXQuY2xvc2VzdCgiLmh0bWwtYXR0cmlidXRlIik7Cisg ICAgICAgIGxldCB0YWdOYW1lTm9kZSA9IGV2ZW50LnRhcmdldC5jbG9zZXN0KCIuaHRtbC10YWct bmFtZSIpOworICAgICAgICBsZXQgYXR0cmlidXRlTm9kZSA9IGV2ZW50LnRhcmdldC5jbG9zZXN0 KCIuaHRtbC1hdHRyaWJ1dGUiKTsKICAgICAgICAgbGV0IHRleHROb2RlID0gZXZlbnQudGFyZ2V0 LmNsb3Nlc3QoIi5odG1sLXRleHQtbm9kZSIpOwogCiAgICAgICAgIGxldCBhdHRyaWJ1dGVOYW1l ID0gbnVsbDsKLSAgICAgICAgaWYgKGF0dHJpYnV0ZSkgewotICAgICAgICAgICAgbGV0IGF0dHJp YnV0ZU5hbWVFbGVtZW50ID0gYXR0cmlidXRlLmdldEVsZW1lbnRzQnlDbGFzc05hbWUoImh0bWwt YXR0cmlidXRlLW5hbWUiKVswXTsKKyAgICAgICAgaWYgKGF0dHJpYnV0ZU5vZGUpIHsKKyAgICAg ICAgICAgIGxldCBhdHRyaWJ1dGVOYW1lRWxlbWVudCA9IGF0dHJpYnV0ZU5vZGUuZ2V0RWxlbWVu dHNCeUNsYXNzTmFtZSgiaHRtbC1hdHRyaWJ1dGUtbmFtZSIpWzBdOwogICAgICAgICAgICAgaWYg KGF0dHJpYnV0ZU5hbWVFbGVtZW50KQogICAgICAgICAgICAgICAgIGF0dHJpYnV0ZU5hbWUgPSBh dHRyaWJ1dGVOYW1lRWxlbWVudC50ZXh0Q29udGVudC50cmltKCk7CiAgICAgICAgIH0KQEAgLTc1 OSwyMyArNzYwLDIzIEBAIFdJLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQg ZXh0ZW5kcyBXSS5UcmVlRWxlbWVudAogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0 b3IoKTsKIAogICAgICAgICBsZXQgaXNFZGl0YWJsZU5vZGUgPSB0aGlzLnJlcHJlc2VudGVkT2Jq ZWN0Lm5vZGVUeXBlKCkgPT09IE5vZGUuRUxFTUVOVF9OT0RFICYmIHRoaXMuZWRpdGFibGU7Ci0g ICAgICAgIGxldCBpc05vblNoYWRvd0VkaXRhYmxlID0gIXRoaXMucmVwcmVzZW50ZWRPYmplY3Qu aXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSAmJiB0aGlzLmVkaXRhYmxlOwotICAgICAgICBsZXQg Zm9yYmlkZGVuQ2xvc2luZ1RhZyA9IFdJLkRPTVRyZWVFbGVtZW50LkZvcmJpZGRlbkNsb3NpbmdU YWdFbGVtZW50cy5oYXModGhpcy5yZXByZXNlbnRlZE9iamVjdC5ub2RlTmFtZUluQ29ycmVjdENh c2UoKSk7CisgICAgICAgIGxldCBpc05vblNoYWRvd0VkaXRhYmxlID0gIXRoaXMucmVwcmVzZW50 ZWRPYmplY3QuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSAmJiBpc0VkaXRhYmxlTm9kZTsKKyAg ICAgICAgbGV0IGFscmVhZHlFZGl0aW5nSFRNTCA9IHRoaXMuX2h0bWxFZGl0RWxlbWVudCAmJiBX SS5pc0JlaW5nRWRpdGVkKHRoaXMuX2h0bWxFZGl0RWxlbWVudCk7CiAKICAgICAgICAgaWYgKGlz RWRpdGFibGVOb2RlKSB7Ci0gICAgICAgICAgICBpZiAoIWZvcmJpZGRlbkNsb3NpbmdUYWcpIHsK KyAgICAgICAgICAgIGlmICghRE9NVHJlZUVsZW1lbnQuRm9yYmlkZGVuQ2xvc2luZ1RhZ0VsZW1l bnRzLmhhcyh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm5vZGVOYW1lSW5Db3JyZWN0Q2FzZSgpKSkg ewogICAgICAgICAgICAgICAgIHN1Yk1lbnVzLmFkZC5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJD aGlsZCIsICJBIHN1Ym1lbnUgaXRlbSBvZiAnQWRkJyB0byBhcHBlbmQgRE9NIG5vZGVzIHRvIHRo ZSBzZWxlY3RlZCBET00gbm9kZSIpLCAoKSA9PiB7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMu X2FkZEhUTUwoKTsKLSAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICB9LCBhbHJl YWR5RWRpdGluZ0hUTUwpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBzdWJNZW51cy5h ZGQuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiUHJldmlvdXMgU2libGluZyIsICJBIHN1Ym1lbnUg aXRlbSBvZiAnQWRkJyB0byBhZGQgRE9NIG5vZGVzIGJlZm9yZSB0aGUgc2VsZWN0ZWQgRE9NIG5v ZGUiKSwgKCkgPT4gewogICAgICAgICAgICAgICAgIHRoaXMuX2FkZFByZXZpb3VzU2libGluZygp OwotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9LCBhbHJlYWR5RWRpdGluZ0hUTUwpOwog CiAgICAgICAgICAgICBzdWJNZW51cy5hZGQuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiTmV4dCBT aWJsaW5nIiwgIkEgc3VibWVudSBpdGVtIG9mICdBZGQnIHRvIGFkZCBET00gbm9kZXMgYWZ0ZXIg dGhlIHNlbGVjdGVkIERPTSBub2RlIiksICgpID0+IHsKICAgICAgICAgICAgICAgICB0aGlzLl9h ZGROZXh0U2libGluZygpOwotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9LCBhbHJlYWR5 RWRpdGluZ0hUTUwpOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKGlzTm9uU2hhZG93RWRpdGFi bGUpIHsKQEAgLTc4NywyNSArNzg4LDI3IEBAIFdJLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9N VHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5UcmVlRWxlbWVudAogICAgICAgICBpZiAodGhpcy5lZGl0 YWJsZSkgewogICAgICAgICAgICAgc3ViTWVudXMuZWRpdC5hcHBlbmRJdGVtKFdJLlVJU3RyaW5n KCJIVE1MIiksICgpID0+IHsKICAgICAgICAgICAgICAgICB0aGlzLl9lZGl0QXNIVE1MKCk7Ci0g ICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0sIGFscmVhZHlFZGl0aW5nSFRNTCk7CiAgICAg ICAgIH0KIAogICAgICAgICBpZiAoaXNOb25TaGFkb3dFZGl0YWJsZSkgewogICAgICAgICAgICAg aWYgKGF0dHJpYnV0ZU5hbWUpIHsKICAgICAgICAgICAgICAgICBzdWJNZW51cy5lZGl0LmFwcGVu ZEl0ZW0oV0kuVUlTdHJpbmcoIkF0dHJpYnV0ZSIpLCAoKSA9PiB7Ci0gICAgICAgICAgICAgICAg ICAgIHRoaXMuX3N0YXJ0RWRpdGluZ0F0dHJpYnV0ZShhdHRyaWJ1dGUsIGV2ZW50LnRhcmdldCk7 Ci0gICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3N0YXJ0RWRp dGluZ0F0dHJpYnV0ZShhdHRyaWJ1dGVOb2RlLCBldmVudC50YXJnZXQpOworICAgICAgICAgICAg ICAgIH0sIFdJLmlzQmVpbmdFZGl0ZWQoYXR0cmlidXRlTm9kZSkpOwogICAgICAgICAgICAgfQog Ci0gICAgICAgICAgICBzdWJNZW51cy5lZGl0LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmcoIlRhZyIs ICJBIHN1Ym1lbnUgaXRlbSBvZiAnRWRpdCcgdG8gY2hhbmdlIERPTSBlbGVtZW50J3MgdGFnIG5h bWUiKSwgKCkgPT4gewotICAgICAgICAgICAgICAgIHRoaXMuX3N0YXJ0RWRpdGluZ1RhZ05hbWUo KTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgaWYgKCFET01UcmVlRWxlbWVudC5FZGl0 VGFnQmxhY2tsaXN0Lmhhcyh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm5vZGVOYW1lSW5Db3JyZWN0 Q2FzZSgpKSkgeworICAgICAgICAgICAgICAgIHN1Yk1lbnVzLmVkaXQuYXBwZW5kSXRlbShXSS5V SVN0cmluZygiVGFnIiwgIkEgc3VibWVudSBpdGVtIG9mICdFZGl0JyB0byBjaGFuZ2UgRE9NIGVs ZW1lbnQncyB0YWcgbmFtZSIpLCAoKSA9PiB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3N0 YXJ0RWRpdGluZ1RhZ05hbWUodGFnTmFtZU5vZGUpOworICAgICAgICAgICAgICAgIH0sIFdJLmlz QmVpbmdFZGl0ZWQodGFnTmFtZU5vZGUpKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAg ICAgICAgIGlmICh0ZXh0Tm9kZSAmJiB0aGlzLmVkaXRhYmxlKSB7CiAgICAgICAgICAgICBzdWJN ZW51cy5lZGl0LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmcoIlRleHQiKSwgKCkgPT4gewogICAgICAg ICAgICAgICAgIHRoaXMuX3N0YXJ0RWRpdGluZ1RleHROb2RlKHRleHROb2RlKTsKLSAgICAgICAg ICAgIH0pOworICAgICAgICAgICAgfSwgV0kuaXNCZWluZ0VkaXRlZCh0ZXh0Tm9kZSkpOwogICAg ICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlzUHNldWRvRWxl bWVudCgpKSB7Cg== 372591 2019-06-20 15:12:20 -0700 2019-06-20 15:45:23 -0700 Patch bug-199052-20190620151219.patch text/plain 5462 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDhmNWM3Mzk4OTFkODFhMTQ1OWM4MGYzMzVkZGRh OWU0MjIxODQwYzAuLjc2MTYzZjVhMGQ4ZWUxZjMxYTViNjA3OGNkNWYzZjYxNzg0MmZiNjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA2LTIwICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF ZGl0IC0+IFRhZyBkb2Vzbid0IGRvIGFueXRoaW5nIGZvciBodG1sLCBoZWFkLCBhbmQgYm9keSBl bGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk5MDUyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MTkyMzkwNj4KKworICAgICAgICBSZXZp ZXdlZCBieSBNYXR0IEJha2VyLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5wb3B1 bGF0ZURPTU5vZGVDb250ZXh0TWVudSk6CisgICAgICAgICAtIERvbid0IHNob3cgYW4gIkVkaXQg PiBUYWciIGZvciA8aHRtbD4sIDxoZWFkPiwgYW5kIDxib2R5PiBub2RlcworICAgICAgICAgLSBE aXNhYmxlIGFueSAiRWRpdCIgc3VibWVudSBpdGVtIGlmIGl0J3MgdGFyZ2V0IGlzIGFscmVhZHkg YmVpbmcgZWRpdGVkCisgICAgICAgICAtIFByZXZlbnQgIkFkZCIgc3VibWVudSBpdGVtcyBmcm9t IGJlaW5nIHNob3duIGZvciB0ZXh0IG5vZGVzCisKIDIwMTktMDYtMTkgIERldmluIFJvdXNzbyAg PGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046 IERlYnVnZ2VyOiBjdXJyZW50IGNhbGwgZnJhbWUgaW5kaWNhdG9yIGlzbid0IHZlcnRpY2FsbHkg Y2VudGVyZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKaW5kZXggYWViZmYwM2ExY2FhMWViNWFlMDgy NzYyNDZiNzE1MDJkYmRjYjIxNS4uODUyOThlZDU5N2QwNmYyMzg1MzAzZDRmMWMzNWFiN2JmOGQ3 YTg0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKQEAgLTc0MywxMiArNzQzLDEyIEBAIFdJLkRP TVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5UcmVlRWxlbWVu dAogCiAgICAgcG9wdWxhdGVET01Ob2RlQ29udGV4dE1lbnUoY29udGV4dE1lbnUsIHN1Yk1lbnVz LCBldmVudCkKICAgICB7Ci0gICAgICAgIGxldCBhdHRyaWJ1dGUgPSBldmVudC50YXJnZXQuY2xv c2VzdCgiLmh0bWwtYXR0cmlidXRlIik7CisgICAgICAgIGxldCBhdHRyaWJ1dGVOb2RlID0gZXZl bnQudGFyZ2V0LmNsb3Nlc3QoIi5odG1sLWF0dHJpYnV0ZSIpOwogICAgICAgICBsZXQgdGV4dE5v ZGUgPSBldmVudC50YXJnZXQuY2xvc2VzdCgiLmh0bWwtdGV4dC1ub2RlIik7CiAKICAgICAgICAg bGV0IGF0dHJpYnV0ZU5hbWUgPSBudWxsOwotICAgICAgICBpZiAoYXR0cmlidXRlKSB7Ci0gICAg ICAgICAgICBsZXQgYXR0cmlidXRlTmFtZUVsZW1lbnQgPSBhdHRyaWJ1dGUuZ2V0RWxlbWVudHNC eUNsYXNzTmFtZSgiaHRtbC1hdHRyaWJ1dGUtbmFtZSIpWzBdOworICAgICAgICBpZiAoYXR0cmli dXRlTm9kZSkgeworICAgICAgICAgICAgbGV0IGF0dHJpYnV0ZU5hbWVFbGVtZW50ID0gYXR0cmli dXRlTm9kZS5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJodG1sLWF0dHJpYnV0ZS1uYW1lIilbMF07 CiAgICAgICAgICAgICBpZiAoYXR0cmlidXRlTmFtZUVsZW1lbnQpCiAgICAgICAgICAgICAgICAg YXR0cmlidXRlTmFtZSA9IGF0dHJpYnV0ZU5hbWVFbGVtZW50LnRleHRDb250ZW50LnRyaW0oKTsK ICAgICAgICAgfQpAQCAtNzU5LDIzICs3NTksMjMgQEAgV0kuRE9NVHJlZUVsZW1lbnQgPSBjbGFz cyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdJLlRyZWVFbGVtZW50CiAgICAgICAgIGNvbnRleHRN ZW51LmFwcGVuZFNlcGFyYXRvcigpOwogCiAgICAgICAgIGxldCBpc0VkaXRhYmxlTm9kZSA9IHRo aXMucmVwcmVzZW50ZWRPYmplY3Qubm9kZVR5cGUoKSA9PT0gTm9kZS5FTEVNRU5UX05PREUgJiYg dGhpcy5lZGl0YWJsZTsKLSAgICAgICAgbGV0IGlzTm9uU2hhZG93RWRpdGFibGUgPSAhdGhpcy5y ZXByZXNlbnRlZE9iamVjdC5pc0luVXNlckFnZW50U2hhZG93VHJlZSgpICYmIHRoaXMuZWRpdGFi bGU7Ci0gICAgICAgIGxldCBmb3JiaWRkZW5DbG9zaW5nVGFnID0gV0kuRE9NVHJlZUVsZW1lbnQu Rm9yYmlkZGVuQ2xvc2luZ1RhZ0VsZW1lbnRzLmhhcyh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lm5v ZGVOYW1lSW5Db3JyZWN0Q2FzZSgpKTsKKyAgICAgICAgbGV0IGlzTm9uU2hhZG93RWRpdGFibGUg PSAhdGhpcy5yZXByZXNlbnRlZE9iamVjdC5pc0luVXNlckFnZW50U2hhZG93VHJlZSgpICYmIGlz RWRpdGFibGVOb2RlOworICAgICAgICBsZXQgYWxyZWFkeUVkaXRpbmdIVE1MID0gdGhpcy5faHRt bEVkaXRFbGVtZW50ICYmIFdJLmlzQmVpbmdFZGl0ZWQodGhpcy5faHRtbEVkaXRFbGVtZW50KTsK IAogICAgICAgICBpZiAoaXNFZGl0YWJsZU5vZGUpIHsKLSAgICAgICAgICAgIGlmICghZm9yYmlk ZGVuQ2xvc2luZ1RhZykgeworICAgICAgICAgICAgaWYgKCFET01UcmVlRWxlbWVudC5Gb3JiaWRk ZW5DbG9zaW5nVGFnRWxlbWVudHMuaGFzKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qubm9kZU5hbWVJ bkNvcnJlY3RDYXNlKCkpKSB7CiAgICAgICAgICAgICAgICAgc3ViTWVudXMuYWRkLmFwcGVuZEl0 ZW0oV0kuVUlTdHJpbmcoIkNoaWxkIiwgIkEgc3VibWVudSBpdGVtIG9mICdBZGQnIHRvIGFwcGVu ZCBET00gbm9kZXMgdG8gdGhlIHNlbGVjdGVkIERPTSBub2RlIiksICgpID0+IHsKICAgICAgICAg ICAgICAgICAgICAgdGhpcy5fYWRkSFRNTCgpOwotICAgICAgICAgICAgICAgIH0pOworICAgICAg ICAgICAgICAgIH0sIGFscmVhZHlFZGl0aW5nSFRNTCk7CiAgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgIHN1Yk1lbnVzLmFkZC5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJQcmV2aW91cyBTaWJs aW5nIiwgIkEgc3VibWVudSBpdGVtIG9mICdBZGQnIHRvIGFkZCBET00gbm9kZXMgYmVmb3JlIHRo ZSBzZWxlY3RlZCBET00gbm9kZSIpLCAoKSA9PiB7CiAgICAgICAgICAgICAgICAgdGhpcy5fYWRk UHJldmlvdXNTaWJsaW5nKCk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0sIGFscmVh ZHlFZGl0aW5nSFRNTCk7CiAKICAgICAgICAgICAgIHN1Yk1lbnVzLmFkZC5hcHBlbmRJdGVtKFdJ LlVJU3RyaW5nKCJOZXh0IFNpYmxpbmciLCAiQSBzdWJtZW51IGl0ZW0gb2YgJ0FkZCcgdG8gYWRk IERPTSBub2RlcyBhZnRlciB0aGUgc2VsZWN0ZWQgRE9NIG5vZGUiKSwgKCkgPT4gewogICAgICAg ICAgICAgICAgIHRoaXMuX2FkZE5leHRTaWJsaW5nKCk7Ci0gICAgICAgICAgICB9KTsKKyAgICAg ICAgICAgIH0sIGFscmVhZHlFZGl0aW5nSFRNTCk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAo aXNOb25TaGFkb3dFZGl0YWJsZSkgewpAQCAtNzg3LDI1ICs3ODcsMjkgQEAgV0kuRE9NVHJlZUVs ZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdJLlRyZWVFbGVtZW50CiAgICAg ICAgIGlmICh0aGlzLmVkaXRhYmxlKSB7CiAgICAgICAgICAgICBzdWJNZW51cy5lZGl0LmFwcGVu ZEl0ZW0oV0kuVUlTdHJpbmcoIkhUTUwiKSwgKCkgPT4gewogICAgICAgICAgICAgICAgIHRoaXMu X2VkaXRBc0hUTUwoKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSwgYWxyZWFkeUVk aXRpbmdIVE1MKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChpc05vblNoYWRvd0VkaXRhYmxl KSB7CiAgICAgICAgICAgICBpZiAoYXR0cmlidXRlTmFtZSkgewogICAgICAgICAgICAgICAgIHN1 Yk1lbnVzLmVkaXQuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiQXR0cmlidXRlIiksICgpID0+IHsK LSAgICAgICAgICAgICAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nQXR0cmlidXRlKGF0dHJpYnV0 ZSwgZXZlbnQudGFyZ2V0KTsKLSAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICAg ICAgdGhpcy5fc3RhcnRFZGl0aW5nQXR0cmlidXRlKGF0dHJpYnV0ZU5vZGUsIGV2ZW50LnRhcmdl dCk7CisgICAgICAgICAgICAgICAgfSwgV0kuaXNCZWluZ0VkaXRlZChhdHRyaWJ1dGVOb2RlKSk7 CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHN1Yk1lbnVzLmVkaXQuYXBwZW5kSXRlbShX SS5VSVN0cmluZygiVGFnIiwgIkEgc3VibWVudSBpdGVtIG9mICdFZGl0JyB0byBjaGFuZ2UgRE9N IGVsZW1lbnQncyB0YWcgbmFtZSIpLCAoKSA9PiB7Ci0gICAgICAgICAgICAgICAgdGhpcy5fc3Rh cnRFZGl0aW5nVGFnTmFtZSgpOwotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBpZiAoIURP TVRyZWVFbGVtZW50LkVkaXRUYWdCbGFja2xpc3QuaGFzKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qu bm9kZU5hbWVJbkNvcnJlY3RDYXNlKCkpKSB7CisgICAgICAgICAgICAgICAgbGV0IHRhZ05hbWVO b2RlID0gZXZlbnQudGFyZ2V0LmNsb3Nlc3QoIi5odG1sLXRhZy1uYW1lIik7CisKKyAgICAgICAg ICAgICAgICBzdWJNZW51cy5lZGl0LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmcoIlRhZyIsICJBIHN1 Ym1lbnUgaXRlbSBvZiAnRWRpdCcgdG8gY2hhbmdlIERPTSBlbGVtZW50J3MgdGFnIG5hbWUiKSwg KCkgPT4geworICAgICAgICAgICAgICAgICAgICB0aGlzLl9zdGFydEVkaXRpbmdUYWdOYW1lKHRh Z05hbWVOb2RlKTsKKyAgICAgICAgICAgICAgICB9LCBXSS5pc0JlaW5nRWRpdGVkKHRhZ05hbWVO b2RlKSk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodGV4dE5vZGUg JiYgdGhpcy5lZGl0YWJsZSkgewogICAgICAgICAgICAgc3ViTWVudXMuZWRpdC5hcHBlbmRJdGVt KFdJLlVJU3RyaW5nKCJUZXh0IiksICgpID0+IHsKICAgICAgICAgICAgICAgICB0aGlzLl9zdGFy dEVkaXRpbmdUZXh0Tm9kZSh0ZXh0Tm9kZSk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgICAg IH0sIFdJLmlzQmVpbmdFZGl0ZWQodGV4dE5vZGUpKTsKICAgICAgICAgfQogCiAgICAgICAgIGlm ICghdGhpcy5yZXByZXNlbnRlZE9iamVjdC5pc1BzZXVkb0VsZW1lbnQoKSkgewo=