191021 2018-10-29 00:10:00 -0700 Web Inspector: Styles: missing contextmenu items for links 2018-10-31 16:58:34 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1472869 0 hi 2018-10-29 00:10:00 -0700 The contextmenu of styles with links should show the usual "Open in New Tab" and "Copy Link Address" options. 1472870 1 353277 hi 2018-10-29 00:11:39 -0700 Created attachment 353277 Patch 1473113 2 353277 joepeck 2018-10-29 16:38:49 -0700 Comment on attachment 353277 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353277&action=review r=me > Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js:97 > contextMenu.appendItem(WI.UIString("Open in New Tab"), () => { Hmm, Safari doesn't show "Open in New Tab" if the link is a `javascript:` link. I think we should probably do the same for `javascript:` / `data:` and maybe all non-http/https links. > Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js:117 > contextMenu.appendItem(WI.UIString("Copy Link Address"), () => { Hmm, Safari shows "Copy Link" instead of "Copy Link Address". I think we should probably update our text. > Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js:708 > + WI.appendContextMenuItemsForURL(contextMenu, token.value); Does this work with both an absolute and relative URL? 1473165 3 353349 hi 2018-10-29 19:58:18 -0700 Created attachment 353349 Patch 1473954 4 353349 commit-queue 2018-10-31 16:57:37 -0700 Comment on attachment 353349 Patch Clearing flags on attachment: 353349 Committed r237660: <https://trac.webkit.org/changeset/237660> 1473955 5 commit-queue 2018-10-31 16:57:39 -0700 All reviewed patches have been landed. Closing bug. 1473957 6 webkit-bug-importer 2018-10-31 16:58:34 -0700 <rdar://problem/45716821> 353277 2018-10-29 00:11:39 -0700 2018-10-29 19:58:16 -0700 Patch bug-191021-20181029001138.patch text/plain 4142 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNkNTJmY2RiYmZhNzlkZjFmMzE1OTE2ZWM3ZTJl Yzc4ODdkNGMyYjEuLmMyOTExZjNmMDMyOTkzZGFhY2U1NzllNTY5MzdiMDk2YTI0OWRlOTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTEwLTI5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZXM6IG1pc3NpbmcgY29udGV4dG1lbnUgaXRlbXMgZm9yIGxpbmtzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEwMjEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv U3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRTdHls ZVByb3BlcnR5LnByb3RvdHlwZS5fcmVuZGVyVmFsdWUpOgorICAgICAgICAoV0kuU3ByZWFkc2hl ZXRTdHlsZVByb3BlcnR5LnByb3RvdHlwZS5faGFuZGxlTGlua0NvbnRleHRNZW51KTogQWRkZWQu CisgICAgICAgIElmIHRoZSB0b2tlbiBpcyBzdWJ0eXBlIG9mICJsaW5rIiwgYWRkIGNvbnRleHRt ZW51IGl0ZW1zIHRvIHRoZSB3cmFwcGVyIGVsZW1lbnQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzOgorICAgICAgICAoV0kuYXBwZW5kQ29u dGV4dE1lbnVJdGVtc0ZvclVSTC5zaG93UmVzb3VyY2VXaXRoT3B0aW9ucyk6CisgICAgICAgIChX SS5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yVVJMKToKKyAgICAgICAgRHJpdmUtYnk6IGRvbid0 IGFzc3VtZSB0aGF0IGBvcHRpb25zYCB3aWxsIGJlIHByb3ZpZGVkLgorCiAyMDE4LTEwLTI3ICBN YXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBUYWJsZSBzaG91bGQgc3VwcG9ydCBkZWxldGluZyByb3dzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51 VXRpbGl0aWVzLmpzCmluZGV4IDA5NmE2NWEyYzc4MWEzNDc1ZDE1ZDk1MGY5ZmZjZjVlNDE2Nzk4 NzEuLjJlODZkMzMxODI0NzU3MTc1ZTZlNTNjNDgzOWZmOTkwNTgxNzI4Y2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRp bGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbnRleHRNZW51VXRpbGl0aWVzLmpzCkBAIC04MCwxOSArODAsMTggQEAgV0kuYXBwZW5kQ29u dGV4dE1lbnVJdGVtc0ZvclNvdXJjZUNvZGUgPSBmdW5jdGlvbihjb250ZXh0TWVudSwgc291cmNl Q29kZU9yTG9jYXQKICAgICB9CiB9OwogCi1XSS5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yVVJM ID0gZnVuY3Rpb24oY29udGV4dE1lbnUsIHVybCwgb3B0aW9ucykKK1dJLmFwcGVuZENvbnRleHRN ZW51SXRlbXNGb3JVUkwgPSBmdW5jdGlvbihjb250ZXh0TWVudSwgdXJsLCBvcHRpb25zID0ge30p CiB7CiAgICAgaWYgKCF1cmwpCiAgICAgICAgIHJldHVybjsKIAotICAgIGxldCB7c291cmNlQ29k ZSwgbG9jYXRpb24sIGZyYW1lfSA9IG9wdGlvbnM7CiAgICAgZnVuY3Rpb24gc2hvd1Jlc291cmNl V2l0aE9wdGlvbnMob3B0aW9ucykgewotICAgICAgICBpZiAobG9jYXRpb24pCi0gICAgICAgICAg ICBXSS5zaG93U291cmNlQ29kZUxvY2F0aW9uKGxvY2F0aW9uLCBvcHRpb25zKTsKLSAgICAgICAg ZWxzZSBpZiAoc291cmNlQ29kZSkKLSAgICAgICAgICAgIFdJLnNob3dTb3VyY2VDb2RlKHNvdXJj ZUNvZGUsIG9wdGlvbnMpOworICAgICAgICBpZiAob3B0aW9ucy5sb2NhdGlvbikKKyAgICAgICAg ICAgIFdJLnNob3dTb3VyY2VDb2RlTG9jYXRpb24ob3B0aW9ucy5sb2NhdGlvbiwgb3B0aW9ucyk7 CisgICAgICAgIGVsc2UgaWYgKG9wdGlvbnMuc291cmNlQ29kZSkKKyAgICAgICAgICAgIFdJLnNo b3dTb3VyY2VDb2RlKG9wdGlvbnMuc291cmNlQ29kZSwgb3B0aW9ucyk7CiAgICAgICAgIGVsc2UK LSAgICAgICAgICAgIFdJLm9wZW5VUkwodXJsLCBmcmFtZSwgb3B0aW9ucyk7CisgICAgICAgICAg ICBXSS5vcGVuVVJMKHVybCwgb3B0aW9ucy5mcmFtZSwgb3B0aW9ucyk7CiAgICAgfQogCiAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiT3BlbiBpbiBOZXcgVGFiIiksICgp ID0+IHsKQEAgLTExMyw2ICsxMTIsOCBAQCBXSS5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yVVJM ID0gZnVuY3Rpb24oY29udGV4dE1lbnUsIHVybCwgb3B0aW9ucykKICAgICAgICAgfQogICAgIH0K IAorICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOworCiAgICAgY29udGV4dE1lbnUu YXBwZW5kSXRlbShXSS5VSVN0cmluZygiQ29weSBMaW5rIEFkZHJlc3MiKSwgKCkgPT4gewogICAg ICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQodXJsKTsKICAgICB9KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNo ZWV0U3R5bGVQcm9wZXJ0eS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwppbmRleCAzMDdjYmNhOWY5NjlmMDhl NGYxOTU2YzQyYjA2ZDAxMjk2M2Y1MzU2Li5hZTA5MTVmNGE1MmJiMjI2MzExZWQ2YjEwYjIxZGJm MTA0ZWFlYTg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCkBA IC0zNzgsNiArMzc4LDEwIEBAIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNw cmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgICAg IGxldCBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICAgICAg ICAgIHNwYW4uY2xhc3NMaXN0LmFkZChjbGFzc05hbWUpOwogICAgICAgICAgICAgICAgIHNwYW4u dGV4dENvbnRlbnQgPSB0b2tlbi52YWx1ZS50cnVuY2F0ZU1pZGRsZShtYXhWYWx1ZUxlbmd0aCk7 CisKKyAgICAgICAgICAgICAgICBpZiAodG9rZW4udHlwZSAmJiB0b2tlbi50eXBlLmluY2x1ZGVz KCJsaW5rIikpCisgICAgICAgICAgICAgICAgICAgIHNwYW4uYWRkRXZlbnRMaXN0ZW5lcigiY29u dGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVMaW5rQ29udGV4dE1lbnUuYmluZCh0aGlzLCB0b2tlbikp OworCiAgICAgICAgICAgICAgICAgcmV0dXJuIHNwYW47CiAgICAgICAgICAgICB9CiAKQEAgLTY5 Niw2ICs3MDAsMTMgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBXSS5zaG93 U291cmNlQ29kZUxvY2F0aW9uKHNvdXJjZUNvZGUuY3JlYXRlU291cmNlQ29kZUxvY2F0aW9uKHJh bmdlLnN0YXJ0TGluZSwgcmFuZ2Uuc3RhcnRDb2x1bW4pLCBvcHRpb25zKTsKICAgICAgICAgfSk7 CiAgICAgfQorCisgICAgX2hhbmRsZUxpbmtDb250ZXh0TWVudSh0b2tlbiwgZXZlbnQpCisgICAg eworICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBXSS5Db250ZXh0TWVudS5jcmVhdGVGcm9tRXZl bnQoZXZlbnQpOworCisgICAgICAgIFdJLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JVUkwoY29u dGV4dE1lbnUsIHRva2VuLnZhbHVlKTsKKyAgICB9CiB9OwogCiBXSS5TcHJlYWRzaGVldFN0eWxl UHJvcGVydHkuU3R5bGVDbGFzc05hbWUgPSAicHJvcGVydHkiOwo= 353349 2018-10-29 19:58:18 -0700 2018-10-31 16:57:37 -0700 Patch bug-191021-20181029195817.patch text/plain 7015 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNkNTJmY2RiYmZhNzlkZjFmMzE1OTE2ZWM3ZTJl Yzc4ODdkNGMyYjEuLjIzNWI5ZDBhYTdhN2IwODU2MmE2MDQxOGNlOWUyNDFlYmU3OTEzYmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE4LTEwLTI5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZXM6IG1pc3NpbmcgY29udGV4dG1lbnUgaXRlbXMgZm9yIGxpbmtzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEwMjEKKworICAgICAgICBSZXZp ZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0U3R5 bGVQcm9wZXJ0eS5wcm90b3R5cGUuX3JlbmRlclZhbHVlKToKKyAgICAgICAgKFdJLlNwcmVhZHNo ZWV0U3R5bGVQcm9wZXJ0eS5wcm90b3R5cGUuX2hhbmRsZUxpbmtDb250ZXh0TWVudSk6IEFkZGVk LgorICAgICAgICBJZiB0aGUgdG9rZW4gaXMgc3VidHlwZSBvZiAibGluayIsIGFkZCBjb250ZXh0 bWVudSBpdGVtcyB0byB0aGUgd3JhcHBlciBlbGVtZW50LgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qczoKKyAgICAgICAgKFdJLmFwcGVuZENv bnRleHRNZW51SXRlbXNGb3JVUkwuc2hvd1Jlc291cmNlV2l0aE9wdGlvbnMpOgorICAgICAgICAo V0kuYXBwZW5kQ29udGV4dE1lbnVJdGVtc0ZvclVSTCk6CisgICAgICAgIERyaXZlLWJ5OiBkb24n dCBhc3N1bWUgdGhhdCBgb3B0aW9uc2Agd2lsbCBiZSBwcm92aWRlZC4KKworICAgICAgICAqIExv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwogMjAxOC0xMC0yNyAg TWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogVGFibGUgc2hvdWxkIHN1cHBvcnQgZGVsZXRpbmcgcm93cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKaW5kZXggNTA2Yjg1M2VmYTU0OGRlMjgwZDkyNmM1MTQ1YzExM2ZlN2YzOTlh NC4uMzkyYzA4YzI1NjIwODBhYTM5Zjk5YjE5ZDM0M2I5MmNhYjc4NDI4OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC0yMjcsNyArMjI3LDcgQEAgbG9jYWxpemVkU3RyaW5n c1siQ29udHJvbHMiXSA9ICJDb250cm9scyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb29raWVzIl0g PSAiQ29va2llcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb3B5Il0gPSAiQ29weSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJDb3B5IEFjdGlvbiJdID0gIkNvcHkgQWN0aW9uIjsKLWxvY2FsaXplZFN0cmlu Z3NbIkNvcHkgTGluayBBZGRyZXNzIl0gPSAiQ29weSBMaW5rIEFkZHJlc3MiOworbG9jYWxpemVk U3RyaW5nc1siQ29weSBMaW5rIl0gPSAiQ29weSBMaW5rIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNv cHkgUGF0aCB0byBQcm9wZXJ0eSJdID0gIkNvcHkgUGF0aCB0byBQcm9wZXJ0eSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJDb3B5IFJvdyJdID0gIkNvcHkgUm93IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNv cHkgU2VsZWN0ZWQiXSA9ICJDb3B5IFNlbGVjdGVkIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGls aXRpZXMuanMKaW5kZXggMDk2YTY1YTJjNzgxYTM0NzVkMTVkOTUwZjlmZmNmNWU0MTY3OTg3MS4u MDUwMGY1MTRhYWJlOTdkMzlkMWNiYjY5OTVmNGQwYWEzM2MwNGFhYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGlsaXRp ZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGV4dE1lbnVVdGlsaXRpZXMuanMKQEAgLTgwLDI1ICs4MCwyNiBAQCBXSS5hcHBlbmRDb250ZXh0 TWVudUl0ZW1zRm9yU291cmNlQ29kZSA9IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBzb3VyY2VDb2Rl T3JMb2NhdAogICAgIH0KIH07CiAKLVdJLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JVUkwgPSBm dW5jdGlvbihjb250ZXh0TWVudSwgdXJsLCBvcHRpb25zKQorV0kuYXBwZW5kQ29udGV4dE1lbnVJ dGVtc0ZvclVSTCA9IGZ1bmN0aW9uKGNvbnRleHRNZW51LCB1cmwsIG9wdGlvbnMgPSB7fSkKIHsK ICAgICBpZiAoIXVybCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbGV0IHtzb3VyY2VDb2RlLCBs b2NhdGlvbiwgZnJhbWV9ID0gb3B0aW9uczsKICAgICBmdW5jdGlvbiBzaG93UmVzb3VyY2VXaXRo T3B0aW9ucyhvcHRpb25zKSB7Ci0gICAgICAgIGlmIChsb2NhdGlvbikKLSAgICAgICAgICAgIFdJ LnNob3dTb3VyY2VDb2RlTG9jYXRpb24obG9jYXRpb24sIG9wdGlvbnMpOwotICAgICAgICBlbHNl IGlmIChzb3VyY2VDb2RlKQotICAgICAgICAgICAgV0kuc2hvd1NvdXJjZUNvZGUoc291cmNlQ29k ZSwgb3B0aW9ucyk7CisgICAgICAgIGlmIChvcHRpb25zLmxvY2F0aW9uKQorICAgICAgICAgICAg V0kuc2hvd1NvdXJjZUNvZGVMb2NhdGlvbihvcHRpb25zLmxvY2F0aW9uLCBvcHRpb25zKTsKKyAg ICAgICAgZWxzZSBpZiAob3B0aW9ucy5zb3VyY2VDb2RlKQorICAgICAgICAgICAgV0kuc2hvd1Nv dXJjZUNvZGUob3B0aW9ucy5zb3VyY2VDb2RlLCBvcHRpb25zKTsKICAgICAgICAgZWxzZQotICAg ICAgICAgICAgV0kub3BlblVSTCh1cmwsIGZyYW1lLCBvcHRpb25zKTsKKyAgICAgICAgICAgIFdJ Lm9wZW5VUkwodXJsLCBvcHRpb25zLmZyYW1lLCBvcHRpb25zKTsKICAgICB9CiAKLSAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJPcGVuIGluIE5ldyBUYWIiKSwgKCkgPT4g ewotICAgICAgICBjb25zdCBmcmFtZSA9IG51bGw7Ci0gICAgICAgIFdJLm9wZW5VUkwodXJsLCBm cmFtZSwge2Fsd2F5c09wZW5FeHRlcm5hbGx5OiB0cnVlfSk7Ci0gICAgfSk7CisgICAgaWYgKCF1 cmwuc3RhcnRzV2l0aCgiamF2YXNjcmlwdDoiKSAmJiAhdXJsLnN0YXJ0c1dpdGgoImRhdGE6Iikp IHsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiT3BlbiBpbiBO ZXcgVGFiIiksICgpID0+IHsKKyAgICAgICAgICAgIGNvbnN0IGZyYW1lID0gbnVsbDsKKyAgICAg ICAgICAgIFdJLm9wZW5VUkwodXJsLCBmcmFtZSwge2Fsd2F5c09wZW5FeHRlcm5hbGx5OiB0cnVl fSk7CisgICAgICAgIH0pOworICAgIH0KIAogICAgIGlmIChXSS5uZXR3b3JrTWFuYWdlci5yZXNv dXJjZUZvclVSTCh1cmwpKSB7CiAgICAgICAgIGlmICghV0kuaXNTaG93aW5nUmVzb3VyY2VzVGFi KCkpIHsKQEAgLTExMyw3ICsxMTQsOSBAQCBXSS5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yVVJM ID0gZnVuY3Rpb24oY29udGV4dE1lbnUsIHVybCwgb3B0aW9ucykKICAgICAgICAgfQogICAgIH0K IAotICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmcoIkNvcHkgTGluayBBZGRy ZXNzIiksICgpID0+IHsKKyAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKKworICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmcoIkNvcHkgTGluayIpLCAoKSA9PiB7 CiAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5jb3B5VGV4dCh1cmwpOwogICAgIH0pOwog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwppbmRleCAzMDdjYmNh OWY5NjlmMDhlNGYxOTU2YzQyYjA2ZDAxMjk2M2Y1MzU2Li4yZWIxMzIwYTI5NGIyMmNlMzU1ZTli NDkwNzZlMjZjMDBhNjMzYTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3Bl cnR5LmpzCkBAIC0zNzgsNiArMzc4LDEwIEBAIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSA9 IGNsYXNzIFNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRlbmRzIFdJLk9iamVjdAogICAgICAg ICAgICAgICAgIGxldCBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAg ICAgICAgICAgICAgIHNwYW4uY2xhc3NMaXN0LmFkZChjbGFzc05hbWUpOwogICAgICAgICAgICAg ICAgIHNwYW4udGV4dENvbnRlbnQgPSB0b2tlbi52YWx1ZS50cnVuY2F0ZU1pZGRsZShtYXhWYWx1 ZUxlbmd0aCk7CisKKyAgICAgICAgICAgICAgICBpZiAodG9rZW4udHlwZSAmJiB0b2tlbi50eXBl LmluY2x1ZGVzKCJsaW5rIikpCisgICAgICAgICAgICAgICAgICAgIHNwYW4uYWRkRXZlbnRMaXN0 ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVMaW5rQ29udGV4dE1lbnUuYmluZCh0aGlz LCB0b2tlbikpOworCiAgICAgICAgICAgICAgICAgcmV0dXJuIHNwYW47CiAgICAgICAgICAgICB9 CiAKQEAgLTY5Niw2ICs3MDAsNTMgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xh c3MgU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAg ICBXSS5zaG93U291cmNlQ29kZUxvY2F0aW9uKHNvdXJjZUNvZGUuY3JlYXRlU291cmNlQ29kZUxv Y2F0aW9uKHJhbmdlLnN0YXJ0TGluZSwgcmFuZ2Uuc3RhcnRDb2x1bW4pLCBvcHRpb25zKTsKICAg ICAgICAgfSk7CiAgICAgfQorCisgICAgX2hhbmRsZUxpbmtDb250ZXh0TWVudSh0b2tlbiwgZXZl bnQpCisgICAgeworICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBXSS5Db250ZXh0TWVudS5jcmVh dGVGcm9tRXZlbnQoZXZlbnQpOworCisgICAgICAgIGxldCByZXNvbHZlVVJMID0gKHVybCkgPT4g eworICAgICAgICAgICAgbGV0IG93bmVyU3R5bGUgPSB0aGlzLl9wcm9wZXJ0eS5vd25lclN0eWxl OworICAgICAgICAgICAgaWYgKCFvd25lclN0eWxlKQorICAgICAgICAgICAgICAgIHJldHVybiB1 cmw7CisKKyAgICAgICAgICAgIGxldCBvd25lclN0eWxlU2hlZXQgPSBvd25lclN0eWxlLm93bmVy U3R5bGVTaGVldDsKKyAgICAgICAgICAgIGlmICghb3duZXJTdHlsZVNoZWV0KSB7CisgICAgICAg ICAgICAgICAgbGV0IG93bmVyUnVsZSA9IG93bmVyU3R5bGUub3duZXJSdWxlOworICAgICAgICAg ICAgICAgIGlmIChvd25lclJ1bGUpCisgICAgICAgICAgICAgICAgICAgIG93bmVyU3R5bGVTaGVl dCA9IG93bmVyUnVsZS5vd25lclN0eWxlU2hlZXQ7CisgICAgICAgICAgICB9CisgICAgICAgICAg ICBpZiAob3duZXJTdHlsZVNoZWV0KSB7CisgICAgICAgICAgICAgICAgaWYgKG93bmVyU3R5bGVT aGVldC51cmwpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBhYnNvbHV0ZVVSTCh1cmwsIG93 bmVyU3R5bGVTaGVldC51cmwpOworCisgICAgICAgICAgICAgICAgbGV0IHBhcmVudEZyYW1lID0g b3duZXJTdHlsZVNoZWV0LnBhcmVudEZyYW1lOworICAgICAgICAgICAgICAgIGlmIChwYXJlbnRG cmFtZSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGFic29sdXRlVVJMKHVybCwgcGFyZW50 RnJhbWUudXJsKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgbGV0IG5vZGUgPSBvd25l clN0eWxlLm5vZGU7CisgICAgICAgICAgICBpZiAoIW5vZGUpIHsKKyAgICAgICAgICAgICAgICBs ZXQgbm9kZVN0eWxlcyA9IG93bmVyU3R5bGUubm9kZVN0eWxlczsKKyAgICAgICAgICAgICAgICBp ZiAoIW5vZGVTdHlsZXMpIHsKKyAgICAgICAgICAgICAgICAgICAgbGV0IG93bmVyUnVsZSA9IG93 bmVyU3R5bGUub3duZXJSdWxlOworICAgICAgICAgICAgICAgICAgICBpZiAob3duZXJSdWxlKQor ICAgICAgICAgICAgICAgICAgICAgICAgbm9kZVN0eWxlcyA9IG93bmVyUnVsZS5ub2RlU3R5bGVz OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAobm9kZVN0eWxlcykKKyAg ICAgICAgICAgICAgICAgICAgbm9kZSA9IG5vZGVTdHlsZXMubm9kZTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgIGlmIChub2RlKSB7CisgICAgICAgICAgICAgICAgbGV0IG93bmVyRG9jdW1l bnQgPSBub2RlLm93bmVyRG9jdW1lbnQ7CisgICAgICAgICAgICAgICAgaWYgKG93bmVyRG9jdW1l bnQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBhYnNvbHV0ZVVSTCh1cmwsIG5vZGUub3du ZXJEb2N1bWVudC5kb2N1bWVudFVSTCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHJl dHVybiB1cmw7CisgICAgICAgIH07CisKKyAgICAgICAgV0kuYXBwZW5kQ29udGV4dE1lbnVJdGVt c0ZvclVSTChjb250ZXh0TWVudSwgcmVzb2x2ZVVSTCh0b2tlbi52YWx1ZSkpOworICAgIH0KIH07 CiAKIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5TdHlsZUNsYXNzTmFtZSA9ICJwcm9wZXJ0 eSI7Cg==