179211 2017-11-02 16:44:33 -0700 Web Inspector: Move Show Compositing Borders/Paint Flashing buttons from Elements tab to Layers tab 2017-11-15 12:21:03 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 174176 1 ross.kirsling ross.kirsling commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1367627 0 ross.kirsling 2017-11-02 16:44:33 -0700 As the new home for compositing layer-related information, the nav bar toggle buttons for the Compositing Borders and Paint Flashing page overlays should be moved to the Layers tab. 1368054 1 325930 ross.kirsling 2017-11-03 12:15:22 -0700 Created attachment 325930 Patch 1368069 2 325930 joepeck 2017-11-03 12:35:53 -0700 Comment on attachment 325930 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=325930&action=review r- just because I want to see an updated patch. The Layers ContentView changes look good to me. > Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:34 > + if (!WI.settings.experimentalEnableLayersTab.value) { Sometimes, to make things less error prone, we just always create the properties and only make them show up in the UI based on settings. This makes the code more resilient (someone might try to use this._compositingBordersButtonNavigationItem and forget that its only sometimes available). For example here you probably want to listen for a change in the WI.settings.experimentalEnableLayersTab.value setting value and dispatch an update to our navigation items. (up to you really, but that would be the most appropriate thing to do). > Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:136 > + if (!WI.settings.experimentalEnableLayersTab.value) > + this._updateCompositingBordersButtonToMatchPageSettings(); Regardless of what you decide to above, you should put the bail inside of _updateCompositingBordersButtonToMatchPageSettings, not at the callsite, because if someone adds a new callsite they might forget to add the check. > Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:157 > + if (!WI.settings.experimentalEnableLayersTab.value) > + WI.showPaintRectsSetting.removeEventListener(null, null, this); Here is a case where unambiguously adding an event listener and removing an event listener would be a win. If the setting's value changes throughout the lifetime of this view being opened / closed, then we can have an add without a remove, or a remove without an add. 1368097 3 325941 ross.kirsling 2017-11-03 13:12:11 -0700 Created attachment 325941 Patch 1368112 4 325941 joepeck 2017-11-03 13:27:50 -0700 Comment on attachment 325941 Patch r=me 1368170 5 325941 commit-queue 2017-11-03 14:53:45 -0700 Comment on attachment 325941 Patch Clearing flags on attachment: 325941 Committed r224434: <https://trac.webkit.org/changeset/224434> 1368171 6 commit-queue 2017-11-03 14:53:47 -0700 All reviewed patches have been landed. Closing bug. 1372126 7 webkit-bug-importer 2017-11-15 12:21:03 -0800 <rdar://problem/35567364> 325930 2017-11-03 12:15:22 -0700 2017-11-03 13:12:10 -0700 Patch bug-179211-20171103121524.patch text/plain 11544 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0MzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj MmExZTg0NTEyZDg3NWRmZjg3ZTFmNTc2N2ViZjAzZjNkNDI3ZTE1Li4yNTBlNTU0MTg5ZThlOWNl Y2E4ZWIwZWMzNGVkYTc2OGUzZDMzZWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNy0xMS0wMyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBTaG93IENvbXBvc2l0aW5nIEJv cmRlcnMvUGFpbnQgRmxhc2hpbmcgYnV0dG9ucyBmcm9tIEVsZW1lbnRzIHRhYiB0byBMYXllcnMg dGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzky MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuRE9N VHJlZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5 cGUuZ2V0IG5hdmlnYXRpb25JdGVtcyk6CisgICAgICAgIChXSS5ET01UcmVlQ29udGVudFZpZXcu cHJvdG90eXBlLnNob3duKToKKyAgICAgICAgKFdJLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5 cGUuY2xvc2VkKToKKyAgICAgICAgR3VhcmQgb2xkIGJ1dHRvbnMgd2l0aCBleHBlcmltZW50YWwg ZmxhZy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcpOgorICAgICAgICAoV0kuTGF5 ZXJzM0RDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IG5hdmlnYXRpb25JdGVtcyk6CisgICAgICAg IChXSS5MYXllcnMzRENvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIChXSS5M YXllcnMzRENvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQpOgorICAgICAgICAoV0kuTGF5ZXJz M0RDb250ZW50Vmlldy5wcm90b3R5cGUuX3Nob3dQYWludFJlY3RzU2V0dGluZ0NoYW5nZWQpOgor ICAgICAgICAoV0kuTGF5ZXJzM0RDb250ZW50Vmlldy5wcm90b3R5cGUuX3RvZ2dsZVBhaW50Rmxh c2hpbmcpOgorICAgICAgICAoV0kuTGF5ZXJzM0RDb250ZW50Vmlldy5wcm90b3R5cGUuX3VwZGF0 ZUNvbXBvc2l0aW5nQm9yZGVyc0J1dHRvblN0YXRlKToKKyAgICAgICAgKFdJLkxheWVyczNEQ29u dGVudFZpZXcucHJvdG90eXBlLl90b2dnbGVDb21wb3NpdGluZ0JvcmRlcnMpOgorICAgICAgICBB ZGQgYnV0dG9ucyB0byBuZXcgaG9tZS4KKyAgICAgICAgTm8gbmVlZCB0byBndWFyZCBmb3IgZ2V0 L3NldENvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGUgYW55bW9yZSwgYXMgdGhlc2Ugd2VyZSBpbnRy b2R1Y2VkIGluIGlPUyA3LgorCiAyMDE3LTExLTAxICBEZXZpbiBSb3Vzc28gIDx3ZWJraXRAZGV2 aW5yb3Vzc28uY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbnNvbGlkYXRlIERPTVRy ZWVFbGVtZW50IGNvbnRleHRtZW51IGl0ZW1zIGludG8gc3VibWVudXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVD b250ZW50Vmlldy5qcwppbmRleCBjYmJmNDgzNDgwMjU5ZTFhNGMzMjIxNDVmNGVjYzE1MTkwYWMw YmI0Li5lM2Y1NmM4ZjA5MTA1NmU1ZjJjZWM3NDkzMmQ4M2UyNGU4YmUzMGRlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVu dFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZUNvbnRlbnRWaWV3LmpzCkBAIC0zMSwxNyArMzEsMTkgQEAgV0kuRE9NVHJlZUNvbnRl bnRWaWV3ID0gY2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcK IAogICAgICAgICBzdXBlcihyZXByZXNlbnRlZE9iamVjdCk7CiAKLSAgICAgICAgdGhpcy5fY29t cG9zaXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0 b25OYXZpZ2F0aW9uSXRlbSgibGF5ZXItYm9yZGVycyIsIFdJLlVJU3RyaW5nKCJTaG93IGNvbXBv c2l0aW5nIGJvcmRlcnMiKSwgV0kuVUlTdHJpbmcoIkhpZGUgY29tcG9zaXRpbmcgYm9yZGVycyIp LCAiSW1hZ2VzL0xheWVyQm9yZGVycy5zdmciLCAxMywgMTMpOwotICAgICAgICB0aGlzLl9jb21w b3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1 dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZUNvbXBvc2l0aW5n Qm9yZGVycywgdGhpcyk7Ci0gICAgICAgIHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5h dmlnYXRpb25JdGVtLmVuYWJsZWQgPSAhIVBhZ2VBZ2VudC5nZXRDb21wb3NpdGluZ0JvcmRlcnNW aXNpYmxlOwotICAgICAgICB0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9u SXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJp b3JpdHkuTG93OwotCi0gICAgICAgIFdJLnNob3dQYWludFJlY3RzU2V0dGluZy5hZGRFdmVudExp c3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwgdGhpcy5fc2hvd1BhaW50UmVjdHNTZXR0 aW5nQ2hhbmdlZCwgdGhpcyk7Ci0gICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZp Z2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJwYWludC1m bGFzaGluZyIsIFdJLlVJU3RyaW5nKCJFbmFibGUgcGFpbnQgZmxhc2hpbmciKSwgV0kuVUlTdHJp bmcoIkRpc2FibGUgcGFpbnQgZmxhc2hpbmciKSwgIkltYWdlcy9QYWludC5zdmciLCAxNiwgMTYp OwotICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZl bnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90 b2dnbGVQYWludEZsYXNoaW5nLCB0aGlzKTsKLSAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1 dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJsZWQgPSAhIVBhZ2VBZ2VudC5zZXRTaG93UGFpbnRSZWN0 czsKLSAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2 YXRlZCA9IFBhZ2VBZ2VudC5zZXRTaG93UGFpbnRSZWN0cyAmJiBXSS5zaG93UGFpbnRSZWN0c1Nl dHRpbmcudmFsdWU7Ci0gICAgICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9u SXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJp b3JpdHkuTG93OworICAgICAgICBpZiAoIVdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUxh eWVyc1RhYi52YWx1ZSkgeworICAgICAgICAgICAgdGhpcy5fY29tcG9zaXRpbmdCb3JkZXJzQnV0 dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgi bGF5ZXItYm9yZGVycyIsIFdJLlVJU3RyaW5nKCJTaG93IGNvbXBvc2l0aW5nIGJvcmRlcnMiKSwg V0kuVUlTdHJpbmcoIkhpZGUgY29tcG9zaXRpbmcgYm9yZGVycyIpLCAiSW1hZ2VzL0xheWVyQm9y ZGVycy5zdmciLCAxMywgMTMpOworICAgICAgICAgICAgdGhpcy5fY29tcG9zaXRpbmdCb3JkZXJz QnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9u SXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90b2dnbGVDb21wb3NpdGluZ0JvcmRlcnMsIHRoaXMp OworICAgICAgICAgICAgdGhpcy5fY29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uZW5hYmxlZCA9ICEhUGFnZUFnZW50LmdldENvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGU7Cisg ICAgICAgICAgICB0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS52 aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHku TG93OworCisgICAgICAgICAgICBXSS5zaG93UGFpbnRSZWN0c1NldHRpbmcuYWRkRXZlbnRMaXN0 ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3Nob3dQYWludFJlY3RzU2V0dGlu Z0NoYW5nZWQsIHRoaXMpOworICAgICAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5h dmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInBhaW50 LWZsYXNoaW5nIiwgV0kuVUlTdHJpbmcoIkVuYWJsZSBwYWludCBmbGFzaGluZyIpLCBXSS5VSVN0 cmluZygiRGlzYWJsZSBwYWludCBmbGFzaGluZyIpLCAiSW1hZ2VzL1BhaW50LnN2ZyIsIDE2LCAx Nik7CisgICAgICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0u YWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0 aGlzLl90b2dnbGVQYWludEZsYXNoaW5nLCB0aGlzKTsKKyAgICAgICAgICAgIHRoaXMuX3BhaW50 Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gISFQYWdlQWdlbnQuc2V0U2hv d1BhaW50UmVjdHM7CisgICAgICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdh dGlvbkl0ZW0uYWN0aXZhdGVkID0gUGFnZUFnZW50LnNldFNob3dQYWludFJlY3RzICYmIFdJLnNo b3dQYWludFJlY3RzU2V0dGluZy52YWx1ZTsKKyAgICAgICAgICAgIHRoaXMuX3BhaW50Rmxhc2hp bmdCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9u SXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OworICAgICAgICB9CiAKICAgICAgICAgV0kuc2hv d1NoYWRvd0RPTVNldHRpbmcuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5n ZWQsIHRoaXMuX3Nob3dTaGFkb3dET01TZXR0aW5nQ2hhbmdlZCwgdGhpcyk7CiAgICAgICAgIHRo aXMuX3Nob3dzU2hhZG93RE9NQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVC dXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvd3Mtc2hhZG93LURPTSIsIFdJLlVJU3RyaW5nKCJTaG93 IHNoYWRvdyBET00gbm9kZXMiKSwgV0kuVUlTdHJpbmcoIkhpZGUgc2hhZG93IERPTSBub2RlcyIp LCAiSW1hZ2VzL1NoYWRvd0RPTS5zdmciLCAxMywgMTMpOwpAQCAtOTMsNyArOTUsMTEgQEAgV0ku RE9NVHJlZUNvbnRlbnRWaWV3ID0gY2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0ku Q29udGVudFZpZXcKIAogICAgIGdldCBuYXZpZ2F0aW9uSXRlbXMoKQogICAgIHsKLSAgICAgICAg cmV0dXJuIFt0aGlzLl9zaG93UHJpbnRTdHlsZXNCdXR0b25OYXZpZ2F0aW9uSXRlbSwgdGhpcy5f c2hvd3NTaGFkb3dET01CdXR0b25OYXZpZ2F0aW9uSXRlbSwgdGhpcy5fY29tcG9zaXRpbmdCb3Jk ZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0sIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0 aW9uSXRlbV07CisgICAgICAgIGxldCBpdGVtcyA9IFt0aGlzLl9zaG93UHJpbnRTdHlsZXNCdXR0 b25OYXZpZ2F0aW9uSXRlbSwgdGhpcy5fc2hvd3NTaGFkb3dET01CdXR0b25OYXZpZ2F0aW9uSXRl bV07CisgICAgICAgIGlmICghV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFi LnZhbHVlKQorICAgICAgICAgICAgaXRlbXMucHVzaCh0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNC dXR0b25OYXZpZ2F0aW9uSXRlbSwgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25J dGVtKTsKKworICAgICAgICByZXR1cm4gaXRlbXM7CiAgICAgfQogCiAgICAgZ2V0IGRvbVRyZWVP dXRsaW5lKCkKQEAgLTEyNSw3ICsxMzEsOSBAQCBXSS5ET01UcmVlQ29udGVudFZpZXcgPSBjbGFz cyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICBzdXBl ci5zaG93bigpOwogCiAgICAgICAgIHRoaXMuX2RvbVRyZWVPdXRsaW5lLnNldFZpc2libGUodHJ1 ZSwgV0kuaXNDb25zb2xlRm9jdXNlZCgpKTsKLSAgICAgICAgdGhpcy5fdXBkYXRlQ29tcG9zaXRp bmdCb3JkZXJzQnV0dG9uVG9NYXRjaFBhZ2VTZXR0aW5ncygpOworCisgICAgICAgIGlmICghV0ku c2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiLnZhbHVlKQorICAgICAgICAgICAg dGhpcy5fdXBkYXRlQ29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uVG9NYXRjaFBhZ2VTZXR0aW5ncygp OwogCiAgICAgICAgIGlmICghdGhpcy5fZG9tVHJlZU91dGxpbmUucm9vdERPTU5vZGUpCiAgICAg ICAgICAgICByZXR1cm47CkBAIC0xNDUsNyArMTUzLDkgQEAgV0kuRE9NVHJlZUNvbnRlbnRWaWV3 ID0gY2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICB7 CiAgICAgICAgIHN1cGVyLmNsb3NlZCgpOwogCi0gICAgICAgIFdJLnNob3dQYWludFJlY3RzU2V0 dGluZy5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworICAgICAgICBpZiAo IVdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUxheWVyc1RhYi52YWx1ZSkKKyAgICAgICAg ICAgIFdJLnNob3dQYWludFJlY3RzU2V0dGluZy5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51 bGwsIHRoaXMpOworCiAgICAgICAgIFdJLnNob3dTaGFkb3dET01TZXR0aW5nLnJlbW92ZUV2ZW50 TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CiAgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5y ZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwogICAgICAgICBXSS5kb21UcmVl TWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xh eWVyczNEQ29udGVudFZpZXcuanMKaW5kZXggMTFlYTRiYmZkNGYwMjkxNTc0ZmFkY2MyMjUyNTM1 NDU2YzZhZTE0NS4uOWRhZTRlZjAyMDBiNWMzZGU2ZTY4N2M2YzRiMDVjMzIxZTU2NDcyYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJz M0RDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzCkBAIC0zMSw2ICszMSwxNyBAQCBXSS5MYXll cnMzRENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bnRlbnRWaWV3CiAKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImxheWVycy0z ZCIpOwogCisgICAgICAgIHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25J dGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImxheWVyLWJvcmRlcnMi LCBXSS5VSVN0cmluZygiU2hvdyBjb21wb3NpdGluZyBib3JkZXJzIiksIFdJLlVJU3RyaW5nKCJI aWRlIGNvbXBvc2l0aW5nIGJvcmRlcnMiKSwgIkltYWdlcy9MYXllckJvcmRlcnMuc3ZnIiwgMTMs IDEzKTsKKyAgICAgICAgdGhpcy5fY29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2Vk LCB0aGlzLl90b2dnbGVDb21wb3NpdGluZ0JvcmRlcnMsIHRoaXMpOworICAgICAgICB0aGlzLl9j b21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkg PSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OworCisgICAgICAgIFdJ LnNob3dQYWludFJlY3RzU2V0dGluZy5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQu Q2hhbmdlZCwgdGhpcy5fc2hvd1BhaW50UmVjdHNTZXR0aW5nQ2hhbmdlZCwgdGhpcyk7CisgICAg ICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3Rp dmF0ZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJwYWludC1mbGFzaGluZyIsIFdJLlVJU3RyaW5nKCJF bmFibGUgcGFpbnQgZmxhc2hpbmciKSwgV0kuVUlTdHJpbmcoIkRpc2FibGUgcGFpbnQgZmxhc2hp bmciKSwgIkltYWdlcy9QYWludC5zdmciLCAxNiwgMTYpOworICAgICAgICB0aGlzLl9wYWludEZs YXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZp Z2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl90b2dnbGVQYWludEZsYXNoaW5nLCB0aGlz KTsKKyAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJs ZWQgPSAhIVBhZ2VBZ2VudC5zZXRTaG93UGFpbnRSZWN0czsKKyAgICAgICAgdGhpcy5fcGFpbnRG bGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRlZCA9IFBhZ2VBZ2VudC5zZXRTaG93 UGFpbnRSZWN0cyAmJiBXSS5zaG93UGFpbnRSZWN0c1NldHRpbmcudmFsdWU7CisgICAgICAgIHRo aXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkg PSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OworCiAgICAgICAgIFdJ LmxheWVyVHJlZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5MYXllclRyZWVNYW5hZ2VyLkV2 ZW50LkxheWVyVHJlZURpZENoYW5nZSwgdGhpcy5fbGF5ZXJUcmVlRGlkQ2hhbmdlLCB0aGlzKTsK IAogICAgICAgICB0aGlzLl9sYXllcnMgPSBbXTsKQEAgLTUxLDYgKzYyLDExIEBAIFdJLkxheWVy czNEQ29udGVudFZpZXcgPSBjbGFzcyBMYXllcnMzRENvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29u dGVudFZpZXcKIAogICAgIC8vIFB1YmxpYwogCisgICAgZ2V0IG5hdmlnYXRpb25JdGVtcygpCisg ICAgeworICAgICAgICByZXR1cm4gW3RoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmln YXRpb25JdGVtLCB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW1dOworICAg IH0KKwogICAgIGdldCBzdXBwbGVtZW50YWxSZXByZXNlbnRlZE9iamVjdHMoKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHRoaXMuX2xheWVyczsKQEAgLTYwLDYgKzc2LDggQEAgV0kuTGF5ZXJzM0RD b250ZW50VmlldyA9IGNsYXNzIExheWVyczNEQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmlldwogICAgIHsKICAgICAgICAgc3VwZXIuc2hvd24oKTsKIAorICAgICAgICB0aGlzLl91cGRh dGVDb21wb3NpdGluZ0JvcmRlcnNCdXR0b25TdGF0ZSgpOworCiAgICAgICAgIGlmICh0aGlzLl9s YXllcnNDaGFuZ2VkV2hpbGVIaWRkZW4pIHsKICAgICAgICAgICAgIHRoaXMuX2xheWVyc0NoYW5n ZWRXaGlsZUhpZGRlbiA9IGZhbHNlOwogCkBAIC03OSw2ICs5Nyw3IEBAIFdJLkxheWVyczNEQ29u dGVudFZpZXcgPSBjbGFzcyBMYXllcnMzRENvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZp ZXcKIAogICAgIGNsb3NlZCgpCiAgICAgeworICAgICAgICBXSS5zaG93UGFpbnRSZWN0c1NldHRp bmcucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3No b3dQYWludFJlY3RzU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwogICAgICAgICBXSS5sYXllclRyZWVN YW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuTGF5ZXJUcmVlTWFuYWdlci5FdmVudC5MYXll clRyZWVEaWRDaGFuZ2UsIHRoaXMuX2xheWVyVHJlZURpZENoYW5nZSwgdGhpcyk7CiAKICAgICAg ICAgc3VwZXIuY2xvc2VkKCk7CkBAIC0zMjQsNiArMzQzLDM1IEBAIFdJLkxheWVyczNEQ29udGVu dFZpZXcgPSBjbGFzcyBMYXllcnMzRENvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcK ICAgICAgICAgdGhpcy5fY29udHJvbHMudGFyZ2V0LmFkZChkZWx0YSk7CiAgICAgICAgIHRoaXMu X2NhbWVyYS5wb3NpdGlvbi5hZGQoZGVsdGEpOwogICAgIH0KKworICAgIF9zaG93UGFpbnRSZWN0 c1NldHRpbmdDaGFuZ2VkKGV2ZW50KQorICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoUGFn ZUFnZW50LnNldFNob3dQYWludFJlY3RzKTsKKworICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5n QnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gV0kuc2hvd1BhaW50UmVjdHNTZXR0aW5n LnZhbHVlOworICAgICAgICBQYWdlQWdlbnQuc2V0U2hvd1BhaW50UmVjdHModGhpcy5fcGFpbnRG bGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRlZCk7CisgICAgfQorCisgICAgX3Rv Z2dsZVBhaW50Rmxhc2hpbmcoZXZlbnQpCisgICAgeworICAgICAgICBXSS5zaG93UGFpbnRSZWN0 c1NldHRpbmcudmFsdWUgPSAhV0kuc2hvd1BhaW50UmVjdHNTZXR0aW5nLnZhbHVlOworICAgIH0K KworICAgIF91cGRhdGVDb21wb3NpdGluZ0JvcmRlcnNCdXR0b25TdGF0ZSgpCisgICAgeworICAg ICAgICAvLyBUaGlzIHZhbHVlIGNhbiBiZSBjaGFuZ2VkIG91dHNpZGUgb2YgV2ViIEluc3BlY3Rv ci4KKyAgICAgICAgLy8gRklYTUU6IEhhdmUgUGFnZUFnZW50IGRpc3BhdGNoIGEgY2hhbmdlIGV2 ZW50IGluc3RlYWQ/CisgICAgICAgIFBhZ2VBZ2VudC5nZXRDb21wb3NpdGluZ0JvcmRlcnNWaXNp YmxlKChlcnJvciwgY29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZSkgPT4geworICAgICAgICAgICAg dGhpcy5fY29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0g ZXJyb3IgPyBmYWxzZSA6IGNvbXBvc2l0aW5nQm9yZGVyc1Zpc2libGU7CisgICAgICAgICAgICB0 aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gZXJy b3IgIT09ICJ1bnN1cHBvcnRlZCI7CisgICAgICAgIH0pOworICAgIH0KKworICAgIF90b2dnbGVD b21wb3NpdGluZ0JvcmRlcnMoZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9jb21wb3NpdGlu Z0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQgPSAhdGhpcy5fY29tcG9zaXRp bmdCb3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkOworICAgICAgICBQYWdlQWdl bnQuc2V0Q29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZSh0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNC dXR0b25OYXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQpOworICAgIH0KIH07CiAKIFdJLkxheWVyczNE Q29udGVudFZpZXcuX3pQYWRkaW5nID0gMzAwMDsK 325941 2017-11-03 13:12:11 -0700 2017-11-03 14:53:45 -0700 Patch bug-179211-20171103131213.patch text/plain 7514 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0MzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj MmExZTg0NTEyZDg3NWRmZjg3ZTFmNTc2N2ViZjAzZjNkNDI3ZTE1Li43ODczYTFlOTdjMTAwNzIw NjcwNTRiODQyMTNmOThkMTE1NTc5NWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxNy0xMS0wMyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBTaG93IENvbXBvc2l0aW5nIEJv cmRlcnMvUGFpbnQgRmxhc2hpbmcgYnV0dG9ucyBmcm9tIEVsZW1lbnRzIHRhYiB0byBMYXllcnMg dGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzky MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuRE9N VHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgbmF2aWdhdGlvbkl0ZW1zKToKKyAgICAgICAg KFdJLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUuX3VwZGF0ZUNvbXBvc2l0aW5nQm9yZGVy c0J1dHRvblRvTWF0Y2hQYWdlU2V0dGluZ3MpOgorICAgICAgICBHdWFyZCBvbGQgYnV0dG9ucyB3 aXRoIGV4cGVyaW1lbnRhbCBmbGFnLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9M YXllcnMzRENvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTGF5ZXJzM0RDb250ZW50Vmlldyk6 CisgICAgICAgIChXSS5MYXllcnMzRENvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgbmF2aWdhdGlv bkl0ZW1zKToKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcucHJvdG90eXBlLnNob3du KToKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcucHJvdG90eXBlLmNsb3NlZCk6Cisg ICAgICAgIChXSS5MYXllcnMzRENvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2hvd1BhaW50UmVjdHNT ZXR0aW5nQ2hhbmdlZCk6CisgICAgICAgIChXSS5MYXllcnMzRENvbnRlbnRWaWV3LnByb3RvdHlw ZS5fdG9nZ2xlUGFpbnRGbGFzaGluZyk6CisgICAgICAgIChXSS5MYXllcnMzRENvbnRlbnRWaWV3 LnByb3RvdHlwZS5fdXBkYXRlQ29tcG9zaXRpbmdCb3JkZXJzQnV0dG9uU3RhdGUpOgorICAgICAg ICAoV0kuTGF5ZXJzM0RDb250ZW50Vmlldy5wcm90b3R5cGUuX3RvZ2dsZUNvbXBvc2l0aW5nQm9y ZGVycyk6CisgICAgICAgIEFkZCBidXR0b25zIHRvIG5ldyBob21lLgorICAgICAgICBObyBuZWVk IHRvIGd1YXJkIGZvciBnZXQvc2V0Q29tcG9zaXRpbmdCb3JkZXJzVmlzaWJsZSBhbnltb3JlLCBh cyB0aGVzZSB3ZXJlIGludHJvZHVjZWQgaW4gaU9TIDcuCisKIDIwMTctMTEtMDEgIERldmluIFJv dXNzbyAgPHdlYmtpdEBkZXZpbnJvdXNzby5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog Y29uc29saWRhdGUgRE9NVHJlZUVsZW1lbnQgY29udGV4dG1lbnUgaXRlbXMgaW50byBzdWJtZW51 cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4IGNiYmY0ODM0ODAyNTllMWE0YzMy MjE0NWY0ZWNjMTUxOTBhYzBiYjQuLjUwMmVmZGZmNDU0MDIyM2MxMDllMmJmZGM2NWE3ZTI0NDZl OGIwM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMKQEAgLTkzLDcgKzkzLDExIEBA IFdJLkRPTVRyZWVDb250ZW50VmlldyA9IGNsYXNzIERPTVRyZWVDb250ZW50VmlldyBleHRlbmRz IFdJLkNvbnRlbnRWaWV3CiAKICAgICBnZXQgbmF2aWdhdGlvbkl0ZW1zKCkKICAgICB7Ci0gICAg ICAgIHJldHVybiBbdGhpcy5fc2hvd1ByaW50U3R5bGVzQnV0dG9uTmF2aWdhdGlvbkl0ZW0sIHRo aXMuX3Nob3dzU2hhZG93RE9NQnV0dG9uTmF2aWdhdGlvbkl0ZW0sIHRoaXMuX2NvbXBvc2l0aW5n Qm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtLCB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2 aWdhdGlvbkl0ZW1dOworICAgICAgICBsZXQgaXRlbXMgPSBbdGhpcy5fc2hvd1ByaW50U3R5bGVz QnV0dG9uTmF2aWdhdGlvbkl0ZW0sIHRoaXMuX3Nob3dzU2hhZG93RE9NQnV0dG9uTmF2aWdhdGlv bkl0ZW1dOworICAgICAgICBpZiAoIVdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUxheWVy c1RhYi52YWx1ZSkKKyAgICAgICAgICAgIGl0ZW1zLnB1c2godGhpcy5fY29tcG9zaXRpbmdCb3Jk ZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0sIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0 aW9uSXRlbSk7CisKKyAgICAgICAgcmV0dXJuIGl0ZW1zOwogICAgIH0KIAogICAgIGdldCBkb21U cmVlT3V0bGluZSgpCkBAIC01MTYsNiArNTIwLDkgQEAgV0kuRE9NVHJlZUNvbnRlbnRWaWV3ID0g Y2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgIF91 cGRhdGVDb21wb3NpdGluZ0JvcmRlcnNCdXR0b25Ub01hdGNoUGFnZVNldHRpbmdzKCkKICAgICB7 CisgICAgICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXllcnNUYWIudmFs dWUpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdmFyIGJ1dHRvbiA9IHRoaXMuX2Nv bXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtOwogCiAgICAgICAgIC8vIFdlIG5l ZWQgdG8gc3luYyB3aXRoIHRoZSBwYWdlIHNldHRpbmdzIHNpbmNlIHRoZXNlIGNhbiBiZSBjb250 cm9sbGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmlldy5qcwppbmRleCAxMWVhNGJiZmQ0ZjAy OTE1NzRmYWRjYzIyNTI1MzU0NTZjNmFlMTQ1Li45ZGFlNGVmMDIwMGI1YzNkZTZlNjg3YzZjNGIw NWMzMjFlNTY0NzJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyczNEQ29udGVudFZpZXcuanMKQEAgLTMxLDYg KzMxLDE3IEBAIFdJLkxheWVyczNEQ29udGVudFZpZXcgPSBjbGFzcyBMYXllcnMzRENvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NM aXN0LmFkZCgibGF5ZXJzLTNkIik7CiAKKyAgICAgICAgdGhpcy5fY29tcG9zaXRpbmdCb3JkZXJz QnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRl bSgibGF5ZXItYm9yZGVycyIsIFdJLlVJU3RyaW5nKCJTaG93IGNvbXBvc2l0aW5nIGJvcmRlcnMi KSwgV0kuVUlTdHJpbmcoIkhpZGUgY29tcG9zaXRpbmcgYm9yZGVycyIpLCAiSW1hZ2VzL0xheWVy Qm9yZGVycy5zdmciLCAxMywgMTMpOworICAgICAgICB0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNC dXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25J dGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZUNvbXBvc2l0aW5nQm9yZGVycywgdGhpcyk7 CisgICAgICAgIHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtLnZp c2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5M b3c7CisKKyAgICAgICAgV0kuc2hvd1BhaW50UmVjdHNTZXR0aW5nLmFkZEV2ZW50TGlzdGVuZXIo V0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCB0aGlzLl9zaG93UGFpbnRSZWN0c1NldHRpbmdDaGFu Z2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25J dGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInBhaW50LWZsYXNoaW5n IiwgV0kuVUlTdHJpbmcoIkVuYWJsZSBwYWludCBmbGFzaGluZyIpLCBXSS5VSVN0cmluZygiRGlz YWJsZSBwYWludCBmbGFzaGluZyIpLCAiSW1hZ2VzL1BhaW50LnN2ZyIsIDE2LCAxNik7CisgICAg ICAgIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3Rl bmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZVBh aW50Rmxhc2hpbmcsIHRoaXMpOworICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uZW5hYmxlZCA9ICEhUGFnZUFnZW50LnNldFNob3dQYWludFJlY3RzOworICAg ICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0g UGFnZUFnZW50LnNldFNob3dQYWludFJlY3RzICYmIFdJLnNob3dQYWludFJlY3RzU2V0dGluZy52 YWx1ZTsKKyAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLnZp c2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5M b3c7CisKICAgICAgICAgV0kubGF5ZXJUcmVlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkxh eWVyVHJlZU1hbmFnZXIuRXZlbnQuTGF5ZXJUcmVlRGlkQ2hhbmdlLCB0aGlzLl9sYXllclRyZWVE aWRDaGFuZ2UsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuX2xheWVycyA9IFtdOwpAQCAtNTEsNiAr NjIsMTEgQEAgV0kuTGF5ZXJzM0RDb250ZW50VmlldyA9IGNsYXNzIExheWVyczNEQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgLy8gUHVibGljCiAKKyAgICBnZXQgbmF2 aWdhdGlvbkl0ZW1zKCkKKyAgICB7CisgICAgICAgIHJldHVybiBbdGhpcy5fY29tcG9zaXRpbmdC b3JkZXJzQnV0dG9uTmF2aWdhdGlvbkl0ZW0sIHRoaXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZp Z2F0aW9uSXRlbV07CisgICAgfQorCiAgICAgZ2V0IHN1cHBsZW1lbnRhbFJlcHJlc2VudGVkT2Jq ZWN0cygpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fbGF5ZXJzOwpAQCAtNjAsNiArNzYs OCBAQCBXSS5MYXllcnMzRENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBl eHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgewogICAgICAgICBzdXBlci5zaG93bigpOwogCisg ICAgICAgIHRoaXMuX3VwZGF0ZUNvbXBvc2l0aW5nQm9yZGVyc0J1dHRvblN0YXRlKCk7CisKICAg ICAgICAgaWYgKHRoaXMuX2xheWVyc0NoYW5nZWRXaGlsZUhpZGRlbikgewogICAgICAgICAgICAg dGhpcy5fbGF5ZXJzQ2hhbmdlZFdoaWxlSGlkZGVuID0gZmFsc2U7CiAKQEAgLTc5LDYgKzk3LDcg QEAgV0kuTGF5ZXJzM0RDb250ZW50VmlldyA9IGNsYXNzIExheWVyczNEQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgY2xvc2VkKCkKICAgICB7CisgICAgICAgIFdJLnNo b3dQYWludFJlY3RzU2V0dGluZy5yZW1vdmVFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQu Q2hhbmdlZCwgdGhpcy5fc2hvd1BhaW50UmVjdHNTZXR0aW5nQ2hhbmdlZCwgdGhpcyk7CiAgICAg ICAgIFdJLmxheWVyVHJlZU1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5MYXllclRyZWVN YW5hZ2VyLkV2ZW50LkxheWVyVHJlZURpZENoYW5nZSwgdGhpcy5fbGF5ZXJUcmVlRGlkQ2hhbmdl LCB0aGlzKTsKIAogICAgICAgICBzdXBlci5jbG9zZWQoKTsKQEAgLTMyNCw2ICszNDMsMzUgQEAg V0kuTGF5ZXJzM0RDb250ZW50VmlldyA9IGNsYXNzIExheWVyczNEQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9jb250cm9scy50YXJnZXQuYWRkKGRlbHRh KTsKICAgICAgICAgdGhpcy5fY2FtZXJhLnBvc2l0aW9uLmFkZChkZWx0YSk7CiAgICAgfQorCisg ICAgX3Nob3dQYWludFJlY3RzU2V0dGluZ0NoYW5nZWQoZXZlbnQpCisgICAgeworICAgICAgICBj b25zb2xlLmFzc2VydChQYWdlQWdlbnQuc2V0U2hvd1BhaW50UmVjdHMpOworCisgICAgICAgIHRo aXMuX3BhaW50Rmxhc2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQgPSBXSS5zaG93 UGFpbnRSZWN0c1NldHRpbmcudmFsdWU7CisgICAgICAgIFBhZ2VBZ2VudC5zZXRTaG93UGFpbnRS ZWN0cyh0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkKTsK KyAgICB9CisKKyAgICBfdG9nZ2xlUGFpbnRGbGFzaGluZyhldmVudCkKKyAgICB7CisgICAgICAg IFdJLnNob3dQYWludFJlY3RzU2V0dGluZy52YWx1ZSA9ICFXSS5zaG93UGFpbnRSZWN0c1NldHRp bmcudmFsdWU7CisgICAgfQorCisgICAgX3VwZGF0ZUNvbXBvc2l0aW5nQm9yZGVyc0J1dHRvblN0 YXRlKCkKKyAgICB7CisgICAgICAgIC8vIFRoaXMgdmFsdWUgY2FuIGJlIGNoYW5nZWQgb3V0c2lk ZSBvZiBXZWIgSW5zcGVjdG9yLgorICAgICAgICAvLyBGSVhNRTogSGF2ZSBQYWdlQWdlbnQgZGlz cGF0Y2ggYSBjaGFuZ2UgZXZlbnQgaW5zdGVhZD8KKyAgICAgICAgUGFnZUFnZW50LmdldENvbXBv c2l0aW5nQm9yZGVyc1Zpc2libGUoKGVycm9yLCBjb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlKSA9 PiB7CisgICAgICAgICAgICB0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9u SXRlbS5hY3RpdmF0ZWQgPSBlcnJvciA/IGZhbHNlIDogY29tcG9zaXRpbmdCb3JkZXJzVmlzaWJs ZTsKKyAgICAgICAgICAgIHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25J dGVtLmVuYWJsZWQgPSBlcnJvciAhPT0gInVuc3VwcG9ydGVkIjsKKyAgICAgICAgfSk7CisgICAg fQorCisgICAgX3RvZ2dsZUNvbXBvc2l0aW5nQm9yZGVycyhldmVudCkKKyAgICB7CisgICAgICAg IHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRlZCA9 ICF0aGlzLl9jb21wb3NpdGluZ0JvcmRlcnNCdXR0b25OYXZpZ2F0aW9uSXRlbS5hY3RpdmF0ZWQ7 CisgICAgICAgIFBhZ2VBZ2VudC5zZXRDb21wb3NpdGluZ0JvcmRlcnNWaXNpYmxlKHRoaXMuX2Nv bXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRlZCk7CisgICAgfQog fTsKIAogV0kuTGF5ZXJzM0RDb250ZW50Vmlldy5felBhZGRpbmcgPSAzMDAwOwo=