177690 2017-09-29 16:28:42 -0700 Web Inspector: Layers tab sidebar's DOM highlight should be by row hover, not row selection 2017-10-03 12:22:52 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 174176 1 ross.kirsling webkit-unassigned commit-queue don.olmstead hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1354762 0 ross.kirsling 2017-09-29 16:28:42 -0700 (Follow-up to https://webkit.org/b/177477.) The Layers sidebar does DOM highlighting when a DataGridNode is selected (and the DataGrid is focused), but this is like nowhere else in Web Inspector. For consistency, we should highlight on *hover*. 1354764 1 322252 ross.kirsling 2017-09-29 16:31:54 -0700 Created attachment 322252 Patch 1354786 2 322252 hi 2017-09-29 17:03:39 -0700 Comment on attachment 322252 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322252&action=review > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:134 > + if (!node || node === this._hoveredDataGridNode) As a precaution against having a highlight that stays visible even after the user has moved their mouse, I would recommend you also have a call to `WI.domTreeManager.hideDOMNodeHighlight();` inside an early-return for `if (!node)`. > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:148 > + if (!this._hoveredDataGridNode) Ditto (134). 1354801 3 ross.kirsling 2017-09-29 17:58:47 -0700 I(In reply to Devin Rousso from comment #2) > Comment on attachment 322252 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=322252&action=review > > > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:134 > > + if (!node || node === this._hoveredDataGridNode) > > As a precaution against having a highlight that stays visible even after the > user has moved their mouse, I would recommend you also have a call to > `WI.domTreeManager.hideDOMNodeHighlight();` inside an early-return for `if > (!node)`. > > > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:148 > > + if (!this._hoveredDataGridNode) > > Ditto (134). Is this a conceivable scenario? FWIW, the logic here is ripped straight from https://trac.webkit.org/browser/webkit/trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGrid.js. 1354808 4 ross.kirsling 2017-09-29 18:14:59 -0700 Hmm, perhaps DOMTreeDataGrid isn't even being used? And admittedly, DOMTreeOutline is almost the same, except does the thing you suggested: https://trac.webkit.org/browser/webkit/trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js#L295 1354816 5 322263 ross.kirsling 2017-09-29 18:29:01 -0700 Created attachment 322263 Patch 1355583 6 322263 hi 2017-10-02 15:59:04 -0700 Comment on attachment 322263 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322263&action=review r=me. Looks good, with a few minor comments. > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:96 > + this._dataGrid.element.addEventListener("mouseout", this._dataGridMouseOut.bind(this), false); I think you want to use "mouseleave" instead. "mouseout" will fire every time the mouse leaves any child element, of which there are a lot in DataGrid. This case is already covered by your "mousemove" implementation, so you only need to add a listener for when the mouse leaves the DataGrid itself, not any of its children. <https://developer.mozilla.org/en-US/docs/Web/Events/mouseleave> > Source/WebInspectorUI/UserInterface/Views/LayerDetailsSidebarPanel.js:139 > + if (node === this._hoveredDataGridNode) This check should probably happen before the if on (134), as otherwise we are firing unnecessary `WI.domTreeManager.hideDOMNodeHighlight` calls. let node = this._dataGrid.dataGridNodeFromNode(event.target); if (node === this._hoveredDataGridNode) return; if (!node) { this._hideDOMNodeHighlight(); return; } 1355605 7 322470 ross.kirsling 2017-10-02 16:45:01 -0700 Created attachment 322470 Patch 1355964 8 322470 commit-queue 2017-10-03 12:21:57 -0700 Comment on attachment 322470 Patch Clearing flags on attachment: 322470 Committed r222801: <http://trac.webkit.org/changeset/222801> 1355965 9 commit-queue 2017-10-03 12:21:59 -0700 All reviewed patches have been landed. Closing bug. 1355966 10 webkit-bug-importer 2017-10-03 12:22:52 -0700 <rdar://problem/34796203> 322252 2017-09-29 16:31:54 -0700 2017-09-29 18:28:58 -0700 Patch bug-177690-20170929163153.patch text/plain 4575 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw Y2Q2NGVhODE2ZmIzZjNiNTAyMTM0YmZlN2YxNzZmZWRiZjVmYWZkLi5lNTJiODdjNzY5ODQyMWI3 Y2UzZGQ3ZTNmNWMyYTdhMWEwN2NiOWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxNy0wOS0yOSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTGF5ZXJzIHRhYiBzaWRlYmFyJ3MgRE9N IGhpZ2hsaWdodCBzaG91bGQgYmUgYnkgcm93IGhvdmVyLCBub3Qgcm93IHNlbGVjdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NjkwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0xheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkxheWVy RGV0YWlsc1NpZGViYXJQYW5lbCk6CisgICAgICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFu ZWwucHJvdG90eXBlLl9idWlsZERhdGFHcmlkKToKKyAgICAgICAgKFdJLkxheWVyRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUuX2RhdGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdlZCk6CisgICAg ICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9kYXRhR3JpZE1vdXNl TW92ZSk6CisgICAgICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9k YXRhR3JpZE1vdXNlT3V0KToKKyAgICAgICAgKFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUuX2RhdGFHcmlkRm9jdXNlZCk6IERlbGV0ZWQuCisgICAgICAgIChXSS5MYXllckRl dGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9kYXRhR3JpZEJsdXJyZWQpOiBEZWxldGVkLgor ICAgICAgICAoV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5faGlnaGxpZ2h0 U2VsZWN0ZWROb2RlKTogRGVsZXRlZC4KKwogMjAxNy0wOS0yNyAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFVuY2F1Z2h0IEV4Y2VwdGlvbjogQXR0ZW1w dGVkIHRvIGFzc2lnbiB0byByZWFkb25seSBwcm9wZXJ0eSAoYXQgQ29udGVudFZpZXcuanM64oCL MjA2OuKAizM0KeKAiwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmlu ZGV4IDRkNjIxZDJjNTgwNWUyZmFmNzhmYTNlMzM4ODViMmNhOTcxNTM0MTQuLmExYmJjOTZmNTdh MWViYzkwM2EyNDBmYTYzODRkYzk3OGY4MzdiMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFp bHNTaWRlYmFyUGFuZWwuanMKQEAgLTM2LDYgKzM2LDcgQEAgV0kuTGF5ZXJEZXRhaWxzU2lkZWJh clBhbmVsID0gY2xhc3MgTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRGV0YWls c1MKICAgICAgICAgdGhpcy5fZGF0YUdyaWROb2Rlc0J5TGF5ZXJJZCA9IG5ldyBNYXA7CiAKICAg ICAgICAgdGhpcy5fZGF0YUdyaWQgPSBudWxsOworICAgICAgICB0aGlzLl9ob3ZlcmVkRGF0YUdy aWROb2RlID0gbnVsbDsKICAgICAgICAgdGhpcy5fYm90dG9tQmFyID0gbnVsbDsKICAgICAgICAg dGhpcy5fbGF5ZXJzQ291bnRMYWJlbCA9IG51bGw7CiAgICAgICAgIHRoaXMuX2xheWVyc01lbW9y eUxhYmVsID0gbnVsbDsKQEAgLTkxLDggKzkyLDggQEAgV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBh bmVsID0gY2xhc3MgTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRGV0YWlsc1MK ICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV0kuRGF0YUdyaWQuU29ydE9yZGVy LkRlc2NlbmRpbmc7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNyZWF0ZVNldHRpbmdzKCJsYXll ci1kZXRhaWxzLXNpZGViYXItcGFuZWwiKTsKIAotICAgICAgICB0aGlzLl9kYXRhR3JpZC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fZGF0YUdyaWRGb2N1c2VkLmJpbmQo dGhpcyksIGZhbHNlKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJibHVyIiwgdGhpcy5fZGF0YUdyaWRCbHVycmVkLmJpbmQodGhpcyksIGZhbHNlKTsK KyAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1v dmUiLCB0aGlzLl9kYXRhR3JpZE1vdXNlTW92ZS5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgICAg IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCB0aGlz Ll9kYXRhR3JpZE1vdXNlT3V0LmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgICAgICB0aGlzLmNv bnRlbnRWaWV3LmFkZFN1YnZpZXcodGhpcy5fZGF0YUdyaWQpOwogICAgIH0KQEAgLTEyNCwzNCAr MTI1LDMxIEBAIFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyRGV0YWls c1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRldGFpbHNTCiAKICAgICBfZGF0YUdyaWRTZWxlY3Rl ZE5vZGVDaGFuZ2VkKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9kYXRhR3JpZC5zZWxlY3Rl ZE5vZGUpIHsKLSAgICAgICAgICAgIHRoaXMuX2hpZ2hsaWdodFNlbGVjdGVkTm9kZSgpOwotICAg ICAgICAgICAgdGhpcy5fc2hvd1BvcG92ZXJGb3JTZWxlY3RlZE5vZGUoKTsKLSAgICAgICAgfSBl bHNlCi0gICAgICAgICAgICBXSS5kb21UcmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdodCgp OworICAgICAgICB0aGlzLl9zaG93UG9wb3ZlckZvclNlbGVjdGVkTm9kZSgpOwogICAgIH0KIAot ICAgIF9kYXRhR3JpZEZvY3VzZWQoZXZlbnQpCisgICAgX2RhdGFHcmlkTW91c2VNb3ZlKGV2ZW50 KQogICAgIHsKLSAgICAgICAgdGhpcy5faGlnaGxpZ2h0U2VsZWN0ZWROb2RlKCk7Ci0gICAgfQor ICAgICAgICBsZXQgbm9kZSA9IHRoaXMuX2RhdGFHcmlkLmRhdGFHcmlkTm9kZUZyb21Ob2RlKGV2 ZW50LnRhcmdldCk7CisgICAgICAgIGlmICghbm9kZSB8fCBub2RlID09PSB0aGlzLl9ob3ZlcmVk RGF0YUdyaWROb2RlKQorICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgX2RhdGFHcmlkQmx1cnJl ZChldmVudCkKLSAgICB7Ci0gICAgICAgIFdJLmRvbVRyZWVNYW5hZ2VyLmhpZGVET01Ob2RlSGln aGxpZ2h0KCk7CisgICAgICAgIHRoaXMuX2hvdmVyZWREYXRhR3JpZE5vZGUgPSBub2RlOworCisg ICAgICAgIGlmIChub2RlLmxheWVyLmlzR2VuZXJhdGVkQ29udGVudCB8fCBub2RlLmxheWVyLmlz UmVmbGVjdGlvbiB8fCBub2RlLmxheWVyLmlzQW5vbnltb3VzKSB7CisgICAgICAgICAgICBjb25z dCB1c2VQYWdlQ29vcmRpbmF0ZXMgPSB0cnVlOworICAgICAgICAgICAgV0kuZG9tVHJlZU1hbmFn ZXIuaGlnaGxpZ2h0UmVjdChub2RlLmxheWVyLmJvdW5kcywgdXNlUGFnZUNvb3JkaW5hdGVzKTsK KyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBXSS5kb21UcmVlTWFuYWdlci5oaWdobGlnaHRE T01Ob2RlKG5vZGUubGF5ZXIubm9kZUlkKTsKICAgICB9CiAKLSAgICBfaGlnaGxpZ2h0U2VsZWN0 ZWROb2RlKCkKKyAgICBfZGF0YUdyaWRNb3VzZU91dChldmVudCkKICAgICB7Ci0gICAgICAgIGlm ICghdGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlKQorICAgICAgICBpZiAoIXRoaXMuX2hvdmVy ZWREYXRhR3JpZE5vZGUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbGV0IGxheWVy ID0gdGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlLmxheWVyOwotICAgICAgICBpZiAobGF5ZXIu aXNHZW5lcmF0ZWRDb250ZW50IHx8IGxheWVyLmlzUmVmbGVjdGlvbiB8fCBsYXllci5pc0Fub255 bW91cykgewotICAgICAgICAgICAgY29uc3QgdXNlUGFnZUNvb3JkaW5hdGVzID0gdHJ1ZTsKLSAg ICAgICAgICAgIFdJLmRvbVRyZWVNYW5hZ2VyLmhpZ2hsaWdodFJlY3QobGF5ZXIuYm91bmRzLCB1 c2VQYWdlQ29vcmRpbmF0ZXMpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIFdJLmRvbVRy ZWVNYW5hZ2VyLmhpZ2hsaWdodERPTU5vZGUobGF5ZXIubm9kZUlkKTsKKyAgICAgICAgV0kuZG9t VHJlZU1hbmFnZXIuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsKKyAgICAgICAgdGhpcy5faG92ZXJl ZERhdGFHcmlkTm9kZSA9IG51bGw7CiAgICAgfQogCiAgICAgX3VwZGF0ZURpc3BsYXlXaXRoTGF5 ZXJzKG5ld0xheWVycykK 322263 2017-09-29 18:29:01 -0700 2017-10-02 16:44:59 -0700 Patch bug-177690-20170929182900.patch text/plain 4694 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw Y2Q2NGVhODE2ZmIzZjNiNTAyMTM0YmZlN2YxNzZmZWRiZjVmYWZkLi5lNTJiODdjNzY5ODQyMWI3 Y2UzZGQ3ZTNmNWMyYTdhMWEwN2NiOWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxNy0wOS0yOSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTGF5ZXJzIHRhYiBzaWRlYmFyJ3MgRE9N IGhpZ2hsaWdodCBzaG91bGQgYmUgYnkgcm93IGhvdmVyLCBub3Qgcm93IHNlbGVjdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NjkwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0xheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkxheWVy RGV0YWlsc1NpZGViYXJQYW5lbCk6CisgICAgICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFu ZWwucHJvdG90eXBlLl9idWlsZERhdGFHcmlkKToKKyAgICAgICAgKFdJLkxheWVyRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUuX2RhdGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdlZCk6CisgICAg ICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9kYXRhR3JpZE1vdXNl TW92ZSk6CisgICAgICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9k YXRhR3JpZE1vdXNlT3V0KToKKyAgICAgICAgKFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUuX2RhdGFHcmlkRm9jdXNlZCk6IERlbGV0ZWQuCisgICAgICAgIChXSS5MYXllckRl dGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9kYXRhR3JpZEJsdXJyZWQpOiBEZWxldGVkLgor ICAgICAgICAoV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5faGlnaGxpZ2h0 U2VsZWN0ZWROb2RlKTogRGVsZXRlZC4KKwogMjAxNy0wOS0yNyAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFVuY2F1Z2h0IEV4Y2VwdGlvbjogQXR0ZW1w dGVkIHRvIGFzc2lnbiB0byByZWFkb25seSBwcm9wZXJ0eSAoYXQgQ29udGVudFZpZXcuanM64oCL MjA2OuKAizM0KeKAiwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmlu ZGV4IDRkNjIxZDJjNTgwNWUyZmFmNzhmYTNlMzM4ODViMmNhOTcxNTM0MTQuLmI4M2JhYTQ5YzBk MDdmNzQ1M2Y2MTEwNTg2YTg1N2Y1NmYyYmQwMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllckRldGFp bHNTaWRlYmFyUGFuZWwuanMKQEAgLTM2LDYgKzM2LDcgQEAgV0kuTGF5ZXJEZXRhaWxzU2lkZWJh clBhbmVsID0gY2xhc3MgTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRGV0YWls c1MKICAgICAgICAgdGhpcy5fZGF0YUdyaWROb2Rlc0J5TGF5ZXJJZCA9IG5ldyBNYXA7CiAKICAg ICAgICAgdGhpcy5fZGF0YUdyaWQgPSBudWxsOworICAgICAgICB0aGlzLl9ob3ZlcmVkRGF0YUdy aWROb2RlID0gbnVsbDsKICAgICAgICAgdGhpcy5fYm90dG9tQmFyID0gbnVsbDsKICAgICAgICAg dGhpcy5fbGF5ZXJzQ291bnRMYWJlbCA9IG51bGw7CiAgICAgICAgIHRoaXMuX2xheWVyc01lbW9y eUxhYmVsID0gbnVsbDsKQEAgLTkxLDggKzkyLDggQEAgV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBh bmVsID0gY2xhc3MgTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRGV0YWlsc1MK ICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV0kuRGF0YUdyaWQuU29ydE9yZGVy LkRlc2NlbmRpbmc7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNyZWF0ZVNldHRpbmdzKCJsYXll ci1kZXRhaWxzLXNpZGViYXItcGFuZWwiKTsKIAotICAgICAgICB0aGlzLl9kYXRhR3JpZC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fZGF0YUdyaWRGb2N1c2VkLmJpbmQo dGhpcyksIGZhbHNlKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJibHVyIiwgdGhpcy5fZGF0YUdyaWRCbHVycmVkLmJpbmQodGhpcyksIGZhbHNlKTsK KyAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1v dmUiLCB0aGlzLl9kYXRhR3JpZE1vdXNlTW92ZS5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgICAg IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCB0aGlz Ll9kYXRhR3JpZE1vdXNlT3V0LmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgICAgICB0aGlzLmNv bnRlbnRWaWV3LmFkZFN1YnZpZXcodGhpcy5fZGF0YUdyaWQpOwogICAgIH0KQEAgLTEyNCwzNCAr MTI1LDM4IEBAIFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyRGV0YWls c1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLkRldGFpbHNTCiAKICAgICBfZGF0YUdyaWRTZWxlY3Rl ZE5vZGVDaGFuZ2VkKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9kYXRhR3JpZC5zZWxlY3Rl ZE5vZGUpIHsKLSAgICAgICAgICAgIHRoaXMuX2hpZ2hsaWdodFNlbGVjdGVkTm9kZSgpOwotICAg ICAgICAgICAgdGhpcy5fc2hvd1BvcG92ZXJGb3JTZWxlY3RlZE5vZGUoKTsKLSAgICAgICAgfSBl bHNlCi0gICAgICAgICAgICBXSS5kb21UcmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdodCgp OworICAgICAgICB0aGlzLl9zaG93UG9wb3ZlckZvclNlbGVjdGVkTm9kZSgpOwogICAgIH0KIAot ICAgIF9kYXRhR3JpZEZvY3VzZWQoZXZlbnQpCisgICAgX2RhdGFHcmlkTW91c2VNb3ZlKGV2ZW50 KQogICAgIHsKLSAgICAgICAgdGhpcy5faGlnaGxpZ2h0U2VsZWN0ZWROb2RlKCk7CisgICAgICAg IGxldCBub2RlID0gdGhpcy5fZGF0YUdyaWQuZGF0YUdyaWROb2RlRnJvbU5vZGUoZXZlbnQudGFy Z2V0KTsKKyAgICAgICAgaWYgKCFub2RlKSB7CisgICAgICAgICAgICB0aGlzLl9oaWRlRE9NTm9k ZUhpZ2hsaWdodCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAg aWYgKG5vZGUgPT09IHRoaXMuX2hvdmVyZWREYXRhR3JpZE5vZGUpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgdGhpcy5faG92ZXJlZERhdGFHcmlkTm9kZSA9IG5vZGU7CisKKyAgICAg ICAgaWYgKG5vZGUubGF5ZXIuaXNHZW5lcmF0ZWRDb250ZW50IHx8IG5vZGUubGF5ZXIuaXNSZWZs ZWN0aW9uIHx8IG5vZGUubGF5ZXIuaXNBbm9ueW1vdXMpIHsKKyAgICAgICAgICAgIGNvbnN0IHVz ZVBhZ2VDb29yZGluYXRlcyA9IHRydWU7CisgICAgICAgICAgICBXSS5kb21UcmVlTWFuYWdlci5o aWdobGlnaHRSZWN0KG5vZGUubGF5ZXIuYm91bmRzLCB1c2VQYWdlQ29vcmRpbmF0ZXMpOworICAg ICAgICB9IGVsc2UKKyAgICAgICAgICAgIFdJLmRvbVRyZWVNYW5hZ2VyLmhpZ2hsaWdodERPTU5v ZGUobm9kZS5sYXllci5ub2RlSWQpOwogICAgIH0KIAotICAgIF9kYXRhR3JpZEJsdXJyZWQoZXZl bnQpCisgICAgX2RhdGFHcmlkTW91c2VPdXQoZXZlbnQpCiAgICAgewotICAgICAgICBXSS5kb21U cmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOworICAgICAgICB0aGlzLl9oaWRlRE9N Tm9kZUhpZ2hsaWdodCgpOwogICAgIH0KIAotICAgIF9oaWdobGlnaHRTZWxlY3RlZE5vZGUoKQor ICAgIF9oaWRlRE9NTm9kZUhpZ2hsaWdodCgpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX2Rh dGFHcmlkLnNlbGVjdGVkTm9kZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBsZXQg bGF5ZXIgPSB0aGlzLl9kYXRhR3JpZC5zZWxlY3RlZE5vZGUubGF5ZXI7Ci0gICAgICAgIGlmIChs YXllci5pc0dlbmVyYXRlZENvbnRlbnQgfHwgbGF5ZXIuaXNSZWZsZWN0aW9uIHx8IGxheWVyLmlz QW5vbnltb3VzKSB7Ci0gICAgICAgICAgICBjb25zdCB1c2VQYWdlQ29vcmRpbmF0ZXMgPSB0cnVl OwotICAgICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIuaGlnaGxpZ2h0UmVjdChsYXllci5ib3Vu ZHMsIHVzZVBhZ2VDb29yZGluYXRlcyk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgV0ku ZG9tVHJlZU1hbmFnZXIuaGlnaGxpZ2h0RE9NTm9kZShsYXllci5ub2RlSWQpOworICAgICAgICBX SS5kb21UcmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOworICAgICAgICB0aGlzLl9o b3ZlcmVkRGF0YUdyaWROb2RlID0gbnVsbDsKICAgICB9CiAKICAgICBfdXBkYXRlRGlzcGxheVdp dGhMYXllcnMobmV3TGF5ZXJzKQo= 322470 2017-10-02 16:45:01 -0700 2017-10-03 12:21:57 -0700 Patch bug-177690-20171002164500.patch text/plain 4772 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw Y2Q2NGVhODE2ZmIzZjNiNTAyMTM0YmZlN2YxNzZmZWRiZjVmYWZkLi5kYmFhNjg3YjJjOGI0ZDU5 NmFkZjY4NGVlNmJhNzAyNTM4YjE0MTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNy0xMC0wMiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTGF5ZXJzIHRhYiBzaWRlYmFyJ3MgRE9N IGhpZ2hsaWdodCBzaG91bGQgYmUgYnkgcm93IGhvdmVyLCBub3Qgcm93IHNlbGVjdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NjkwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9MYXllckRldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5MYXllckRl dGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAoV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVs LnByb3RvdHlwZS5fYnVpbGREYXRhR3JpZCk6CisgICAgICAgIChXSS5MYXllckRldGFpbHNTaWRl YmFyUGFuZWwucHJvdG90eXBlLl9kYXRhR3JpZFNlbGVjdGVkTm9kZUNoYW5nZWQpOgorICAgICAg ICAoV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fZGF0YUdyaWRNb3VzZU1v dmUpOgorICAgICAgICAoV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fZGF0 YUdyaWRNb3VzZUxlYXZlKToKKyAgICAgICAgKFdJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUuX2hpZGVET01Ob2RlSGlnaGxpZ2h0KToKKyAgICAgICAgKFdJLkxheWVyRGV0YWls c1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX2RhdGFHcmlkRm9jdXNlZCk6IERlbGV0ZWQuCisgICAg ICAgIChXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9kYXRhR3JpZEJsdXJy ZWQpOiBEZWxldGVkLgorICAgICAgICAoV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLnByb3Rv dHlwZS5faGlnaGxpZ2h0U2VsZWN0ZWROb2RlKTogRGVsZXRlZC4KKwogMjAxNy0wOS0yNyAgSm9z ZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFVuY2F1Z2h0IEV4 Y2VwdGlvbjogQXR0ZW1wdGVkIHRvIGFzc2lnbiB0byByZWFkb25seSBwcm9wZXJ0eSAoYXQgQ29u dGVudFZpZXcuanM64oCLMjA2OuKAizM0KeKAiwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJEZXRhaWxzU2lk ZWJhclBhbmVsLmpzCmluZGV4IDRkNjIxZDJjNTgwNWUyZmFmNzhmYTNlMzM4ODViMmNhOTcxNTM0 MTQuLjRmMDkxYTkwOTJkOGI0MDUyYmNiYzRkMmQ5NDUyMmYyOTkxYzU3YTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyRGV0YWlsc1Np ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9MYXllckRldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTM2LDYgKzM2LDcgQEAgV0kuTGF5 ZXJEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsIGV4 dGVuZHMgV0kuRGV0YWlsc1MKICAgICAgICAgdGhpcy5fZGF0YUdyaWROb2Rlc0J5TGF5ZXJJZCA9 IG5ldyBNYXA7CiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBudWxsOworICAgICAgICB0aGlz Ll9ob3ZlcmVkRGF0YUdyaWROb2RlID0gbnVsbDsKICAgICAgICAgdGhpcy5fYm90dG9tQmFyID0g bnVsbDsKICAgICAgICAgdGhpcy5fbGF5ZXJzQ291bnRMYWJlbCA9IG51bGw7CiAgICAgICAgIHRo aXMuX2xheWVyc01lbW9yeUxhYmVsID0gbnVsbDsKQEAgLTkxLDggKzkyLDggQEAgV0kuTGF5ZXJE ZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVu ZHMgV0kuRGV0YWlsc1MKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV0kuRGF0 YUdyaWQuU29ydE9yZGVyLkRlc2NlbmRpbmc7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNyZWF0 ZVNldHRpbmdzKCJsYXllci1kZXRhaWxzLXNpZGViYXItcGFuZWwiKTsKIAotICAgICAgICB0aGlz Ll9kYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fZGF0YUdy aWRGb2N1c2VkLmJpbmQodGhpcyksIGZhbHNlKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJibHVyIiwgdGhpcy5fZGF0YUdyaWRCbHVycmVkLmJpbmQo dGhpcyksIGZhbHNlKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJtb3VzZW1vdmUiLCB0aGlzLl9kYXRhR3JpZE1vdXNlTW92ZS5iaW5kKHRoaXMpLCBm YWxzZSk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi bW91c2VsZWF2ZSIsIHRoaXMuX2RhdGFHcmlkTW91c2VMZWF2ZS5iaW5kKHRoaXMpLCBmYWxzZSk7 CiAKICAgICAgICAgdGhpcy5jb250ZW50Vmlldy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFHcmlkKTsK ICAgICB9CkBAIC0xMjQsMzQgKzEyNSwzOCBAQCBXSS5MYXllckRldGFpbHNTaWRlYmFyUGFuZWwg PSBjbGFzcyBMYXllckRldGFpbHNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5EZXRhaWxzUwogCiAg ICAgX2RhdGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdlZCgpCiAgICAgewotICAgICAgICBpZiAodGhp cy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlKSB7Ci0gICAgICAgICAgICB0aGlzLl9oaWdobGlnaHRT ZWxlY3RlZE5vZGUoKTsKLSAgICAgICAgICAgIHRoaXMuX3Nob3dQb3BvdmVyRm9yU2VsZWN0ZWRO b2RlKCk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIuaGlk ZURPTU5vZGVIaWdobGlnaHQoKTsKKyAgICAgICAgdGhpcy5fc2hvd1BvcG92ZXJGb3JTZWxlY3Rl ZE5vZGUoKTsKICAgICB9CiAKLSAgICBfZGF0YUdyaWRGb2N1c2VkKGV2ZW50KQorICAgIF9kYXRh R3JpZE1vdXNlTW92ZShldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2hpZ2hsaWdodFNlbGVj dGVkTm9kZSgpOworICAgICAgICBsZXQgbm9kZSA9IHRoaXMuX2RhdGFHcmlkLmRhdGFHcmlkTm9k ZUZyb21Ob2RlKGV2ZW50LnRhcmdldCk7CisgICAgICAgIGlmIChub2RlID09PSB0aGlzLl9ob3Zl cmVkRGF0YUdyaWROb2RlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICghbm9k ZSkgeworICAgICAgICAgICAgdGhpcy5faGlkZURPTU5vZGVIaWdobGlnaHQoKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX2hvdmVyZWREYXRhR3JpZE5v ZGUgPSBub2RlOworCisgICAgICAgIGlmIChub2RlLmxheWVyLmlzR2VuZXJhdGVkQ29udGVudCB8 fCBub2RlLmxheWVyLmlzUmVmbGVjdGlvbiB8fCBub2RlLmxheWVyLmlzQW5vbnltb3VzKSB7Cisg ICAgICAgICAgICBjb25zdCB1c2VQYWdlQ29vcmRpbmF0ZXMgPSB0cnVlOworICAgICAgICAgICAg V0kuZG9tVHJlZU1hbmFnZXIuaGlnaGxpZ2h0UmVjdChub2RlLmxheWVyLmJvdW5kcywgdXNlUGFn ZUNvb3JkaW5hdGVzKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBXSS5kb21UcmVlTWFu YWdlci5oaWdobGlnaHRET01Ob2RlKG5vZGUubGF5ZXIubm9kZUlkKTsKICAgICB9CiAKLSAgICBf ZGF0YUdyaWRCbHVycmVkKGV2ZW50KQorICAgIF9kYXRhR3JpZE1vdXNlTGVhdmUoZXZlbnQpCiAg ICAgewotICAgICAgICBXSS5kb21UcmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOwor ICAgICAgICB0aGlzLl9oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOwogICAgIH0KIAotICAgIF9oaWdo bGlnaHRTZWxlY3RlZE5vZGUoKQorICAgIF9oaWRlRE9NTm9kZUhpZ2hsaWdodCgpCiAgICAgewot ICAgICAgICBpZiAoIXRoaXMuX2RhdGFHcmlkLnNlbGVjdGVkTm9kZSkKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICBsZXQgbGF5ZXIgPSB0aGlzLl9kYXRhR3JpZC5zZWxlY3RlZE5vZGUu bGF5ZXI7Ci0gICAgICAgIGlmIChsYXllci5pc0dlbmVyYXRlZENvbnRlbnQgfHwgbGF5ZXIuaXNS ZWZsZWN0aW9uIHx8IGxheWVyLmlzQW5vbnltb3VzKSB7Ci0gICAgICAgICAgICBjb25zdCB1c2VQ YWdlQ29vcmRpbmF0ZXMgPSB0cnVlOwotICAgICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIuaGln aGxpZ2h0UmVjdChsYXllci5ib3VuZHMsIHVzZVBhZ2VDb29yZGluYXRlcyk7Ci0gICAgICAgIH0g ZWxzZQotICAgICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIuaGlnaGxpZ2h0RE9NTm9kZShsYXll ci5ub2RlSWQpOworICAgICAgICBXSS5kb21UcmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdo dCgpOworICAgICAgICB0aGlzLl9ob3ZlcmVkRGF0YUdyaWROb2RlID0gbnVsbDsKICAgICB9CiAK ICAgICBfdXBkYXRlRGlzcGxheVdpdGhMYXllcnMobmV3TGF5ZXJzKQo=