191659 2018-11-14 14:53:03 -0800 Web Inspector: Audit: automatically add to tab bar when the experimental setting is enabled 2018-11-26 10:22:34 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=183420 InRadar P2 Normal --- 190754 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1478639 0 hi 2018-11-14 14:53:03 -0800 Having to enable the experimental setting, reload WebInspector, and then right-click the tab bar to access the new tab is unnecessary. It should automatically be added when enabling the setting. 1478648 1 354856 hi 2018-11-14 15:05:21 -0800 Created attachment 354856 Patch 1481405 2 354856 mattbaker 2018-11-25 13:32:12 -0800 Comment on attachment 354856 Patch Does this need to be rebased? it doesn't apply locally for me, and doesn't match trunk: https://trac.webkit.org/browser/webkit/trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js That aside, I like the idea of automatically adding tabs when enabling the corresponding experimental setting. i wonder about the following case though: - User enables the Layers Tab (for example) - Layers tab is automatically added - User hides Layers tab, leaving the setting enabled - Reload Web Inspector => Layers tab will be added again Ideally we would want to honor the user's decision to hide the tab. Maybe this isn't an issue, since these are experimental features. 1481420 3 hi 2018-11-25 14:48:30 -0800 (In reply to Matt Baker from comment #2) > That aside, I like the idea of automatically adding tabs when enabling the corresponding experimental setting. i wonder about the following case though: > > - User enables the Layers Tab (for example) > - Layers tab is automatically added > - User hides Layers tab, leaving the setting enabled > - Reload Web Inspector > > => Layers tab will be added again > > Ideally we would want to honor the user's decision to hide the tab. Maybe > this isn't an issue, since these are experimental features. The tab would be hidden, as `WI.AuditTabContentView.isTabAllowed` only returns true if the experimental setting is enabled (the same is true for the layers tab as well). 1481421 4 355606 hi 2018-11-25 14:49:42 -0800 Created attachment 355606 Patch Rebase 1481537 5 355606 joepeck 2018-11-26 09:12:56 -0800 Comment on attachment 355606 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355606&action=review r=me > Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:267 > + let newTabs = WI._openTabsSetting.value.slice(); Maybe move this to WI.settings, or public? It’s default value though uses a bunch of other classes. 1481566 6 355606 hi 2018-11-26 10:16:11 -0800 Comment on attachment 355606 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355606&action=review >> Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:267 >> + let newTabs = WI._openTabsSetting.value.slice(); > > Maybe move this to WI.settings, or public? It’s default value though uses a bunch of other classes. Frankly, this is a bit of a "hack", so I'm not as concerned with the idea of public/private, not to mention the fact that if/when these are made non-experimental, the code here will disappear. 1481571 7 355606 commit-queue 2018-11-26 10:21:03 -0800 Comment on attachment 355606 Patch Clearing flags on attachment: 355606 Committed r238500: <https://trac.webkit.org/changeset/238500> 1481572 8 commit-queue 2018-11-26 10:21:04 -0800 All reviewed patches have been landed. Closing bug. 1481573 9 webkit-bug-importer 2018-11-26 10:22:34 -0800 <rdar://problem/46248193> 354856 2018-11-14 15:05:21 -0800 2018-11-25 14:49:41 -0800 Patch bug-191659-20181114150521.patch text/plain 4558 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJlNGU5YmIzOWVjYTljZmViNTIwZmQ3ZGRkYjYx YjIwN2I1YjE4NDkuLmQ1YzBhOTBjMmEzMTFiODlhZjljNTlhNGRjYTkzNDE0MTIxNTUzZGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE4LTExLTE0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB dWRpdDogYXV0b21hdGljYWxseSBhZGQgdG8gdGFiIGJhciB3aGVuIHRoZSBleHBlcmltZW50YWwg c2V0dGluZyBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTE2NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVF eHBlcmltZW50YWxTZXR0aW5nc1ZpZXcpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNl L01haW4uanM6CisgICAgICAgIChXSS5sb2FkZWQpOgorICAgICAgICBEcml2ZS1ieTogdXNlIGV4 aXN0aW5nIGNvbnN0YW50cyBpbnN0ZWFkIG9mIGhhcmQtY29kZWQgc3RyaW5ncyBmb3IgY29uc2lz dGVuY3kuCisKIDIwMTgtMTEtMTQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENhbnZhczogc2VuZCBhIGNhbGwgc3RhY2sgd2l0aCBl YWNoIGFjdGlvbiBpbnN0ZWFkIG9mIGFuIGFycmF5IG9mIGNhbGwgZnJhbWVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggMzkyYzIy MDQ0NWQ5MTU4YzVmOThjZjc4ZGNiODMyNmY5NjgwNmQwNC4uMmQ1ZjE0YjE5ZTZhZDVlMzNmZjQy ZTc5NzA4ZjJkYTRhMTFhMGRhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMTM4LDcgKzEzOCwxNiBAQCBXSS5sb2FkZWQgPSBm dW5jdGlvbigpCiAKICAgICAvLyBDcmVhdGUgc2V0dGluZ3MuCiAgICAgdGhpcy5fc2hvd2luZ1Nw bGl0Q29uc29sZVNldHRpbmcgPSBuZXcgV0kuU2V0dGluZygic2hvd2luZy1zcGxpdC1jb25zb2xl IiwgZmFsc2UpOwotICAgIHRoaXMuX29wZW5UYWJzU2V0dGluZyA9IG5ldyBXSS5TZXR0aW5nKCJv cGVuLXRhYi10eXBlcyIsIFsiZWxlbWVudHMiLCAibmV0d29yayIsICJkZWJ1Z2dlciIsICJyZXNv dXJjZXMiLCAidGltZWxpbmUiLCAic3RvcmFnZSIsICJjYW52YXMiLCAiY29uc29sZSJdKTsKKyAg ICB0aGlzLl9vcGVuVGFic1NldHRpbmcgPSBuZXcgV0kuU2V0dGluZygib3Blbi10YWItdHlwZXMi LCBbCisgICAgICAgIFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcuVHlwZSwKKyAgICAgICAgV0ku TmV0d29ya1RhYkNvbnRlbnRWaWV3LlR5cGUsCisgICAgICAgIFdJLkRlYnVnZ2VyVGFiQ29udGVu dFZpZXcuVHlwZSwKKyAgICAgICAgV0kuUmVzb3VyY2VzVGFiQ29udGVudFZpZXcuVHlwZSwKKyAg ICAgICAgV0kuVGltZWxpbmVUYWJDb250ZW50Vmlldy5UeXBlLAorICAgICAgICBXSS5TdG9yYWdl VGFiQ29udGVudFZpZXcuVHlwZSwKKyAgICAgICAgV0kuQ2FudmFzVGFiQ29udGVudFZpZXcuVHlw ZSwKKyAgICAgICAgV0kuQ29uc29sZVRhYkNvbnRlbnRWaWV3LlR5cGUsCisgICAgXSk7CiAgICAg dGhpcy5fc2VsZWN0ZWRUYWJJbmRleFNldHRpbmcgPSBuZXcgV0kuU2V0dGluZygic2VsZWN0ZWQt dGFiLWluZGV4IiwgMCk7CiAKICAgICAvLyBTdGF0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNv bnRlbnRWaWV3LmpzCmluZGV4IDk5MWRkNzY5NTI2NWI2MTM1YThjN2ExZTc1NjE5MWI3ZGNmNjc0 MjAuLjRlZDRiOWI3YmU5MWIyYWZmYzk3ZmU0MmYxYmIwN2U0MDhlZGYxYjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29u dGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMjQ3LDExICsyNDcsMTMgQEAgV0kuU2V0 dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5h ZGRTZXBhcmF0b3IoKTsKICAgICAgICAgfQogCisgICAgICAgIGxldCBsYXllclRhYkVuYWJsZWQg PSB3aW5kb3cuTGF5ZXJUcmVlQWdlbnQgJiYgV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxl TGF5ZXJzVGFiLnZhbHVlOwogICAgICAgICBpZiAod2luZG93LkxheWVyVHJlZUFnZW50KSB7CiAg ICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhXSS5VSVN0cmlu ZygiTGF5ZXJzOiIpLCBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXllcnNUYWIsIFdJ LlVJU3RyaW5nKCJFbmFibGUgTGF5ZXJzIFRhYiIpKTsKICAgICAgICAgICAgIGV4cGVyaW1lbnRh bFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKICAgICAgICAgfQogCisgICAgICAgIGxldCBh dWRpdFRhYkVuYWJsZWQgPSBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVBdWRpdFRhYi52 YWx1ZTsKICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0kuVUlT dHJpbmcoIkF1ZGl0OiIpLCBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVBdWRpdFRhYiwg V0kuVUlTdHJpbmcoIkVuYWJsZSBBdWRpdCBUYWIiKSk7CiAgICAgICAgIGV4cGVyaW1lbnRhbFNl dHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIApAQCAtMjYxLDcgKzI2MywxNyBAQCBXSS5TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRz IFdJLlRhYkNvbnRlbnRWaQogICAgICAgICAvLyBGSVhNRTogUmVsb2FkIFdlYiBJbnNwZWN0b3Ig ZG9lcyBub3Qgd29yayB3aXRoIE11bHRpcGxleGluZ0JhY2tlbmRUYXJnZXQuCiAgICAgICAgIGxl dCByZWxvYWRJbnNwZWN0b3JCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24i KTsKICAgICAgICAgcmVsb2FkSW5zcGVjdG9yQnV0dG9uLnRleHRDb250ZW50ID0gV0kuVUlTdHJp bmcoIlJlbG9hZCBXZWIgSW5zcGVjdG9yIik7Ci0gICAgICAgIHJlbG9hZEluc3BlY3RvckJ1dHRv bi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsICgpID0+IHsgd2luZG93LmxvY2F0aW9uLnJlbG9h ZCgpOyB9KTsKKyAgICAgICAgcmVsb2FkSW5zcGVjdG9yQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIo ImNsaWNrIiwgKCkgPT4geworICAgICAgICAgICAgLy8gRm9yY2UgYSBjb3B5IHNvIHRoYXQgV0ku U2V0dGluZyBzZWVzIGl0IGFzIGEgbmV3IHZhbHVlLgorICAgICAgICAgICAgbGV0IG5ld1RhYnMg PSBXSS5fb3BlblRhYnNTZXR0aW5nLnZhbHVlLnNsaWNlKCk7CisgICAgICAgICAgICBpZiAoIWxh eWVyVGFiRW5hYmxlZCAmJiB3aW5kb3cuTGF5ZXJUcmVlQWdlbnQgJiYgV0kuc2V0dGluZ3MuZXhw ZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiLnZhbHVlKQorICAgICAgICAgICAgICAgIG5ld1RhYnMu cHVzaChXSS5MYXllcnNUYWJDb250ZW50Vmlldy5UeXBlKTsKKyAgICAgICAgICAgIGlmICghYXVk aXRUYWJFbmFibGVkICYmIFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUF1ZGl0VGFiLnZh bHVlKQorICAgICAgICAgICAgICAgIG5ld1RhYnMucHVzaChXSS5BdWRpdFRhYkNvbnRlbnRWaWV3 LlR5cGUpOworICAgICAgICAgICAgV0kuX29wZW5UYWJzU2V0dGluZy52YWx1ZSA9IG5ld1RhYnM7 CisKKyAgICAgICAgICAgIHdpbmRvdy5sb2NhdGlvbi5yZWxvYWQoKTsKKyAgICAgICAgfSk7CiAK ICAgICAgICAgbGV0IHJlbG9hZEluc3BlY3RvckNvbnRhaW5lckVsZW1lbnQgPSBleHBlcmltZW50 YWxTZXR0aW5nc1ZpZXcuYWRkQ2VudGVyZWRDb250YWluZXIocmVsb2FkSW5zcGVjdG9yQnV0dG9u LCBXSS5VSVN0cmluZygiZm9yIGNoYW5nZXMgdG8gdGFrZSBlZmZlY3QiKSk7CiAgICAgICAgIHJl bG9hZEluc3BlY3RvckNvbnRhaW5lckVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaGlkZGVuIik7Cg== 355606 2018-11-25 14:49:42 -0800 2018-11-26 10:21:03 -0800 Patch bug-191659-20181125144941.patch text/plain 4443 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDg1NzE0NzdlYWZjZTNiOTY0ZDA2MDFlZjY5MTc3 NmRjYzM0YjZkYTYuLjA2MTIyNGRiMzYyZGU1YjkwY2E2YWQwOGFlMTEzZDk2OTE4N2FlNDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE4LTExLTE0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB dWRpdDogYXV0b21hdGljYWxseSBhZGQgdG8gdGFiIGJhciB3aGVuIHRoZSBleHBlcmltZW50YWwg c2V0dGluZyBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTE2NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVF eHBlcmltZW50YWxTZXR0aW5nc1ZpZXcpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNl L01haW4uanM6CisgICAgICAgIChXSS5sb2FkZWQpOgorICAgICAgICBEcml2ZS1ieTogdXNlIGV4 aXN0aW5nIGNvbnN0YW50cyBpbnN0ZWFkIG9mIGhhcmQtY29kZWQgc3RyaW5ncyBmb3IgY29uc2lz dGVuY3kuCisKIDIwMTgtMTEtMjUgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lczogYWRkIE1lZGlhIHRpbWVsaW5lCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5k ZXggMTBmOWUyNjczN2Q3YTNkZGFmZWIzZDkxZWNjZDQ5NzFhOGYwYWNlNS4uMmQzMDUxNzRhNDA0 ZmMzMWFmZGZmYTY4YzYyMGYyNTQxMTQ0YzBhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMTM4LDcgKzEzOCwxNiBAQCBXSS5s b2FkZWQgPSBmdW5jdGlvbigpCiAKICAgICAvLyBDcmVhdGUgc2V0dGluZ3MuCiAgICAgdGhpcy5f c2hvd2luZ1NwbGl0Q29uc29sZVNldHRpbmcgPSBuZXcgV0kuU2V0dGluZygic2hvd2luZy1zcGxp dC1jb25zb2xlIiwgZmFsc2UpOwotICAgIHRoaXMuX29wZW5UYWJzU2V0dGluZyA9IG5ldyBXSS5T ZXR0aW5nKCJvcGVuLXRhYi10eXBlcyIsIFsiZWxlbWVudHMiLCAibmV0d29yayIsICJkZWJ1Z2dl ciIsICJyZXNvdXJjZXMiLCAidGltZWxpbmUiLCAic3RvcmFnZSIsICJjYW52YXMiLCAiY29uc29s ZSJdKTsKKyAgICB0aGlzLl9vcGVuVGFic1NldHRpbmcgPSBuZXcgV0kuU2V0dGluZygib3Blbi10 YWItdHlwZXMiLCBbCisgICAgICAgIFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcuVHlwZSwKKyAg ICAgICAgV0kuTmV0d29ya1RhYkNvbnRlbnRWaWV3LlR5cGUsCisgICAgICAgIFdJLkRlYnVnZ2Vy VGFiQ29udGVudFZpZXcuVHlwZSwKKyAgICAgICAgV0kuUmVzb3VyY2VzVGFiQ29udGVudFZpZXcu VHlwZSwKKyAgICAgICAgV0kuVGltZWxpbmVUYWJDb250ZW50Vmlldy5UeXBlLAorICAgICAgICBX SS5TdG9yYWdlVGFiQ29udGVudFZpZXcuVHlwZSwKKyAgICAgICAgV0kuQ2FudmFzVGFiQ29udGVu dFZpZXcuVHlwZSwKKyAgICAgICAgV0kuQ29uc29sZVRhYkNvbnRlbnRWaWV3LlR5cGUsCisgICAg XSk7CiAgICAgdGhpcy5fc2VsZWN0ZWRUYWJJbmRleFNldHRpbmcgPSBuZXcgV0kuU2V0dGluZygi c2VsZWN0ZWQtdGFiLWluZGV4IiwgMCk7CiAKICAgICAvLyBTdGF0ZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDg0YmIyNDhkZGUwMmIwY2I3MzZlOTQ1MjgzZTU2 YzFhOWJiZGFlMTkuLmRlY2FlZThhYjIzZTBiMTJkNzMwZmRiYjJhNWIzZjEzZDE0MDc3NzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMjQ3LDExICsyNDcsMTMg QEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRp bmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKICAgICAgICAgfQogCisgICAgICAgIGxldCBsYXllclRh YkVuYWJsZWQgPSB3aW5kb3cuTGF5ZXJUcmVlQWdlbnQgJiYgV0kuc2V0dGluZ3MuZXhwZXJpbWVu dGFsRW5hYmxlTGF5ZXJzVGFiLnZhbHVlOwogICAgICAgICBpZiAod2luZG93LkxheWVyVHJlZUFn ZW50KSB7CiAgICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhX SS5VSVN0cmluZygiTGF5ZXJzOiIpLCBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXll cnNUYWIsIFdJLlVJU3RyaW5nKCJFbmFibGUgTGF5ZXJzIFRhYiIpKTsKICAgICAgICAgICAgIGV4 cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKICAgICAgICAgfQogCisgICAg ICAgIGxldCBhdWRpdFRhYkVuYWJsZWQgPSBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVB dWRpdFRhYi52YWx1ZTsKICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNldHRp bmcoV0kuVUlTdHJpbmcoIkF1ZGl0OiIpLCBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVB dWRpdFRhYiwgV0kuVUlTdHJpbmcoIkVuYWJsZSBBdWRpdCBUYWIiKSk7CiAgICAgICAgIGV4cGVy aW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIApAQCAtMjYwLDcgKzI2MiwxNyBA QCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50Vmll dyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogCiAgICAgICAgIGxldCByZWxvYWRJbnNwZWN0b3JC dXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKICAgICAgICAgcmVsb2Fk SW5zcGVjdG9yQnV0dG9uLnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIlJlbG9hZCBXZWIgSW5z cGVjdG9yIik7Ci0gICAgICAgIHJlbG9hZEluc3BlY3RvckJ1dHRvbi5hZGRFdmVudExpc3RlbmVy KCJjbGljayIsICgpID0+IHsgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnJlb3BlbigpOyB9KTsKKyAg ICAgICAgcmVsb2FkSW5zcGVjdG9yQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgKGV2 ZW50KSA9PiB7CisgICAgICAgICAgICAvLyBGb3JjZSBhIGNvcHkgc28gdGhhdCBXSS5TZXR0aW5n IHNlZXMgaXQgYXMgYSBuZXcgdmFsdWUuCisgICAgICAgICAgICBsZXQgbmV3VGFicyA9IFdJLl9v cGVuVGFic1NldHRpbmcudmFsdWUuc2xpY2UoKTsKKyAgICAgICAgICAgIGlmICghbGF5ZXJUYWJF bmFibGVkICYmIHdpbmRvdy5MYXllclRyZWVBZ2VudCAmJiBXSS5zZXR0aW5ncy5leHBlcmltZW50 YWxFbmFibGVMYXllcnNUYWIudmFsdWUpCisgICAgICAgICAgICAgICAgbmV3VGFicy5wdXNoKFdJ LkxheWVyc1RhYkNvbnRlbnRWaWV3LlR5cGUpOworICAgICAgICAgICAgaWYgKCFhdWRpdFRhYkVu YWJsZWQgJiYgV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQXVkaXRUYWIudmFsdWUpCisg ICAgICAgICAgICAgICAgbmV3VGFicy5wdXNoKFdJLkF1ZGl0VGFiQ29udGVudFZpZXcuVHlwZSk7 CisgICAgICAgICAgICBXSS5fb3BlblRhYnNTZXR0aW5nLnZhbHVlID0gbmV3VGFiczsKKworICAg ICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnJlb3BlbigpOworICAgICAgICB9KTsKIAog ICAgICAgICBsZXQgcmVsb2FkSW5zcGVjdG9yQ29udGFpbmVyRWxlbWVudCA9IGV4cGVyaW1lbnRh bFNldHRpbmdzVmlldy5hZGRDZW50ZXJlZENvbnRhaW5lcihyZWxvYWRJbnNwZWN0b3JCdXR0b24s IFdJLlVJU3RyaW5nKCJmb3IgY2hhbmdlcyB0byB0YWtlIGVmZmVjdCIpKTsKICAgICAgICAgcmVs b2FkSW5zcGVjdG9yQ29udGFpbmVyRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJoaWRkZW4iKTsK