181279 2018-01-03 21:48:46 -0800 Web Inspector: Find next / previous within a resource content view does not have bouncy highlight when editor scrolls 2018-01-08 09:42:22 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1385698 0 joepeck 2018-01-03 21:48:46 -0800 Find next / previous within a resource content view does not have bouncy highlight when editor scrolls Steps to Reproduce: 1. Inspect webkit.org 2. Show Debugger tab 3. Select "global.js" 4. Show Find banner 5. Search for "document" 5. Search forward a few times => When the ContentView scrolls to review a new result there is no bouncy highlight Notes: - We hide the bouncy highlight on scrolls, but the scroll to the new position hid the bouncy highlight! - We also appear to be leaking scroll handlers if we search quickly 1385699 1 webkit-bug-importer 2018-01-03 21:50:21 -0800 <rdar://problem/36291097> 1385701 2 330445 joepeck 2018-01-03 21:55:44 -0800 Created attachment 330445 [PATCH] Proposed Fix 1385924 3 330445 hi 2018-01-04 13:45:20 -0800 Comment on attachment 330445 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=330445&action=review > Source/WebInspectorUI/UserInterface/Views/TextEditor.js:1113 > + if (scrollCount < 2) This seems very risky. Is there a way we can add an "ignoreScroll" member variable that is true whenever we are moving to a highlight position? 1385956 4 330445 joepeck 2018-01-04 15:21:58 -0800 Comment on attachment 330445 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=330445&action=review >> Source/WebInspectorUI/UserInterface/Views/TextEditor.js:1113 >> + if (scrollCount < 2) > > This seems very risky. Is there a way we can add an "ignoreScroll" member variable that is true whenever we are moving to a highlight position? I tried to explain why I didn't do that in the ChangeLog. I think that would be more code, and more error prone, then just triggering this removal after a couple scroll events. I didn't spend too much time thinking about how we could determine if the scroll was programmatic or not. The intent of this scroll handler is if the user is scrolling while the bouncy highlight is up then hide the bouncy. I think that is still achieved with the idea of firing it after 2 scroll. The best solution would be to re-position the bouncy highlight instead of removing it. I could try to do that. 1386000 5 330504 joepeck 2018-01-04 17:54:34 -0800 Created attachment 330504 [PATCH] Proposed Fix 1386759 6 330504 bburg 2018-01-08 09:21:45 -0800 Comment on attachment 330504 [PATCH] Proposed Fix r=me 1386768 7 330504 commit-queue 2018-01-08 09:42:20 -0800 Comment on attachment 330504 [PATCH] Proposed Fix Clearing flags on attachment: 330504 Committed r226517: <https://trac.webkit.org/changeset/226517> 1386769 8 commit-queue 2018-01-08 09:42:22 -0800 All reviewed patches have been landed. Closing bug. 330445 2018-01-03 21:55:44 -0800 2018-01-04 17:54:34 -0800 [PATCH] Proposed Fix bouncy-highlight-1.patch text/plain 4529 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE3ZTYyYjBlOGRhLi4zODU3YjQ4OTRjNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYgQEAKIDIwMTgtMDEtMDMgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBGaW5kIG5leHQgLyBwcmV2aW91cyB3aXRoaW4gYSByZXNvdXJjZSBjb250ZW50IHZpZXcgZG9l cyBub3QgaGF2ZSBib3VuY3kgaGlnaGxpZ2h0IHdoZW4gZWRpdG9yIHNjcm9sbHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTI3OQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzYyOTEwOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanM6Cisg ICAgICAgIChXSS5UZXh0RWRpdG9yLnByb3RvdHlwZS5fcmV2ZWFsU2VhcmNoUmVzdWx0KToKKyAg ICAgICAgKFdJLlRleHRFZGl0b3IucHJvdG90eXBlLl9yZW1vdmVCb3VuY3lIaWdobGlnaHRFbGVt ZW50SWZOZWVkZWQpOgorICAgICAgICBSZW1vdmUgdGhlIGJvdW5jeSBoaWdobGlnaHQgb24gdHdv IHNjcm9sbCBldmVudHMgaW5zdGVhZCBvZiBvbmUuIFRoZSBmaXJzdCBtYXkKKyAgICAgICAgYmUg cHJvZ3JhbW1hdGljYWxseSBzY3JvbGxpbmcgdG8gcmV2ZWFsIHRoZSBzZWFyY2ggcmVzdWx0IGl0 c2VsZi4gQSBzZWNvbmQgd291bGQKKyAgICAgICAgYmUgYSB1c2VyLiBUaGVyZSBpcyBubyBzaW1w bGUgd2F5IHRvIGlkZW50aWZ5IHRoYXQgdGhlIHNjcm9sbCBldmVudCBpdHNlbGYgd2FzCisgICAg ICAgIHRoZSByZXN1bHQgb2Ygb3VyIHJldmVhbGluZyB0aGUgc2VhcmNoIHJlc3VsdCwgYW5kIGlm IHdlIGFkZGVkIGNvZGUgb3IgdGltaW5nCisgICAgICAgIGxvZ2ljIHRvIHRyeSB0byBkZXRlcm1p bmUgdGhhdCBpdCB3b3VsZCBqdXN0IGJlIG1lc3N5LiBJbiBwcmFjdGljZSBpZiB0aGUgdXNlcgor ICAgICAgICBhY3R1YWxseSBzY3JvbGxzIHRoZSBlZGl0b3IgdGhlcmUgd2lsbCBiZSBtdWx0aXBs ZSBzY3JvbGwgZXZlbnRzIGFuZCBzbyB0aGUKKyAgICAgICAgb3JpZ2luYWwgaW50ZW50IG9mIGhp ZGluZyB0aGUgYm91bmNlIGhpZ2hsaWdodCBvbiB1c2VyIHNjcm9sbCBzdGlsbCB3b3JrcyB3ZWxs LgorICAgICAgICBBbHNvLCB0cmFjayB0aGUgYm91bmN5IGhpZ2hsaWdodCBzY3JvbGwgaGFuZGxl ciBpbiBhIG1lbWJlciB2YXJpYWJsZSBzbyB0aGF0CisgICAgICAgIHdlIGFsd2F5cyByZW1lbWJl ciB0byByZW1vdmUgaXQgYW5kIGRvbid0IGxlYWsgc2Nyb2xsIGhhbmRsZXJzLgorCisyMDE4LTAx LTAzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogIkxvZyBWYWx1ZSIgY29udGV4dCBtZW51IGlzIHNvbWV0aW1lcyB1bmF2YWls YWJsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgx Mjc4CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjI4MTY0OT4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCmluZGV4 IDBlNzQyYzcyZmU5Li5hZTU2OGY3ODYyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCkBAIC0xMDgyLDggKzEw ODIsNyBAQCBXSS5UZXh0RWRpdG9yID0gY2xhc3MgVGV4dEVkaXRvciBleHRlbmRzIFdJLlZpZXcK IAogICAgICAgICAvLyBSZW1vdmUgdGhlIGJvdW5jeSBoaWdobGlnaHQgaWYgaXQgaXMgc3RpbGwg YXJvdW5kLiBUaGUgYW5pbWF0aW9uIHdpbGwgbm90CiAgICAgICAgIC8vIHN0YXJ0IHVubGVzcyB3 ZSByZW1vdmUgaXQgYW5kIGFkZCBpdCBiYWNrIHRvIHRoZSBkb2N1bWVudC4KLSAgICAgICAgaWYg KHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQpCi0gICAgICAgICAgICB0aGlzLl9ib3VuY3lI aWdobGlnaHRFbGVtZW50LnJlbW92ZSgpOworICAgICAgICB0aGlzLl9yZW1vdmVCb3VuY3lIaWdo bGlnaHRFbGVtZW50SWZOZWVkZWQoKTsKIAogICAgICAgICAvLyBDcmVhdGUgdGhlIGJvdW5jeSBo aWdobGlnaHQuCiAgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKQEAgLTExMDIsMjggKzExMDEsMzggQEAgV0kuVGV4dEVk aXRvciA9IGNsYXNzIFRleHRFZGl0b3IgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX2Jv dW5jeUhpZ2hsaWdodEVsZW1lbnQudGV4dENvbnRlbnQgPSB0ZXh0Q29udGVudDsKICAgICAgICAg dGhpcy5fYm91bmN5SGlnaGxpZ2h0RWxlbWVudC5zdHlsZS50b3AgPSBjb29yZGluYXRlcy50b3Ag KyAicHgiOwogICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50LnN0eWxlLmxlZnQg PSBjb29yZGluYXRlcy5sZWZ0ICsgInB4IjsKKwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fYm91bmN5SGlnaGxpZ2h0RWxlbWVudCk7CiAKLSAgICAgICAgbGV0IHNjcm9s bEhhbmRsZXIgPSAoKSA9PiB7Ci0gICAgICAgICAgICBpZiAodGhpcy5fYm91bmN5SGlnaGxpZ2h0 RWxlbWVudCkKLSAgICAgICAgICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50LnJl bW92ZSgpOworICAgICAgICAvLyBPbiB0aGUgc2Vjb25kIHNjcm9sbCBldmVudCByZW1vdmUgdGhl IGJvdW5jeSBoaWdobGlnaHQuCisgICAgICAgIC8vIFRoZSBmaXJzdCBzY3JvbGwgbWlnaHQgaGFw cGVuIGFzIHBhcnQgb2YgcmV2ZWFsaW5nIHRoZSBzZWFyY2ggcmVzdWx0LgorICAgICAgICBsZXQg c2Nyb2xsQ291bnQgPSAwOworCisgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodFNjcm9sbEhh bmRsZXIgPSAoKSA9PiB7CisgICAgICAgICAgICBzY3JvbGxDb3VudCsrOworICAgICAgICAgICAg aWYgKHNjcm9sbENvdW50IDwgMikKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICB0aGlzLl9yZW1vdmVCb3VuY3lIaWdobGlnaHRFbGVtZW50SWZOZWVkZWQoKTsKICAgICAgICAg fTsKIAotICAgICAgICB0aGlzLmFkZFNjcm9sbEhhbmRsZXIoc2Nyb2xsSGFuZGxlcik7Ci0KLSAg ICAgICAgZnVuY3Rpb24gYW5pbWF0aW9uRW5kZWQoKQotICAgICAgICB7Ci0gICAgICAgICAgICBp ZiAoIXRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQpCi0gICAgICAgICAgICAgICAgcmV0dXJu OwotCi0gICAgICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50LnJlbW92ZSgpOwot ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQ7Ci0KLSAgICAg ICAgICAgIHRoaXMucmVtb3ZlU2Nyb2xsSGFuZGxlcihzY3JvbGxIYW5kbGVyKTsKLSAgICAgICAg fQorICAgICAgICB0aGlzLmFkZFNjcm9sbEhhbmRsZXIodGhpcy5fYm91bmN5SGlnaGxpZ2h0U2Ny b2xsSGFuZGxlcik7CiAKICAgICAgICAgLy8gTGlzdGVuIGZvciB0aGUgZW5kIG9mIHRoZSBhbmlt YXRpb24gc28gd2UgY2FuIHJlbW92ZSB0aGUgZWxlbWVudC4KLSAgICAgICAgdGhpcy5fYm91bmN5 SGlnaGxpZ2h0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJhbmltYXRpb25lbmQiLCBhbmltYXRp b25FbmRlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fYm91bmN5SGlnaGxpZ2h0RWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJhbmltYXRpb25lbmQiLCAoKSA9PiB7CisgICAgICAgICAgICB0 aGlzLl9yZW1vdmVCb3VuY3lIaWdobGlnaHRFbGVtZW50SWZOZWVkZWQoKTsKKyAgICAgICAgfSk7 CisgICAgfQorCisgICAgX3JlbW92ZUJvdW5jeUhpZ2hsaWdodEVsZW1lbnRJZk5lZWRlZCgpCisg ICAgeworICAgICAgICBpZiAoIXRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5yZW1vdmVTY3JvbGxIYW5kbGVyKHRoaXMuX2Jv dW5jeUhpZ2hsaWdodFNjcm9sbEhhbmRsZXIpOworICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGln aHRTY3JvbGxIYW5kbGVyID0gbnVsbDsKKworICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRF bGVtZW50LnJlbW92ZSgpOworICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50ID0g bnVsbDsKICAgICB9CiAKICAgICBfYmluYXJ5U2VhcmNoSW5zZXJ0aW9uSW5kZXhJblNlYXJjaFJl c3VsdHMob2JqZWN0LCBjb21wYXJhdG9yKQo= 330504 2018-01-04 17:54:34 -0800 2018-01-08 09:42:20 -0800 [PATCH] Proposed Fix resposition-1.patch text/plain 5615 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZhZDIzMjJkMTg0Li5hOTliM2E3ODk3OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTgtMDEtMDQgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBGaW5kIG5leHQgLyBwcmV2aW91cyB3aXRoaW4gYSByZXNvdXJjZSBjb250ZW50IHZpZXcgZG9l cyBub3QgaGF2ZSBib3VuY3kgaGlnaGxpZ2h0IHdoZW4gZWRpdG9yIHNjcm9sbHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTI3OQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzYyOTEwOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanM6Cisg ICAgICAgIChXSS5UZXh0RWRpdG9yLnByb3RvdHlwZS5fcmV2ZWFsU2VhcmNoUmVzdWx0KToKKyAg ICAgICAgUmVwb3NpdGlvbiB0aGUgYm91bmN5IGhpZ2hsaWdodCBvbiBzY3JvbGwgYmFzZWQgb24g dGhlIENvZGVNaXJyb3IKKyAgICAgICAgbGluZS9jaCBwb3NpdGlvbiBvZiB0aGUgc2VhcmNoIHJl c3VsdC4KKworICAgICAgICAoV0kuVGV4dEVkaXRvci5wcm90b3R5cGUuX3JlbW92ZUJvdW5jeUhp Z2hsaWdodEVsZW1lbnRJZk5lZWRlZCk6CisgICAgICAgIFRyYWNrIHRoZSBib3VuY3kgaGlnaGxp Z2h0IHNjcm9sbCBoYW5kbGVyIGluIGEgbWVtYmVyIHZhcmlhYmxlIHNvIHRoYXQKKyAgICAgICAg d2UgYWx3YXlzIHJlbWVtYmVyIHRvIHJlbW92ZSBpdCBhbmQgZG9uJ3QgbGVhayBzY3JvbGwgaGFu ZGxlcnMuCisKIDIwMTgtMDEtMDMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiDijJhHIC8g4oen4oyYRyB0ZXh0IHNlYXJjaCBk b2VzIG5vdCB3b3JraW5nIGFmdGVyIGNsb3NpbmcgZmluZCBiYW5uZXIKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCmlu ZGV4IGMzZDNmYzhhNmJiLi41ZjZlMjRmMDBkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCkBAIC0xMDU1LDcg KzEwNTUsNyBAQCBXSS5UZXh0RWRpdG9yID0gY2xhc3MgVGV4dEVkaXRvciBleHRlbmRzIFdJLlZp ZXcKIAogICAgIF9yZXZlYWxTZWFyY2hSZXN1bHQocmVzdWx0LCBjaGFuZ2VGb2N1cywgZGlyZWN0 aW9uSW5DYXNlT2ZSZXZhbGlkYXRpb24pCiAgICAgewotICAgICAgICB2YXIgcG9zaXRpb24gPSBy ZXN1bHQuZmluZCgpOworICAgICAgICBsZXQgcG9zaXRpb24gPSByZXN1bHQuZmluZCgpOwogCiAg ICAgICAgIC8vIENoZWNrIGZvciBhIHZhbGlkIHBvc2l0aW9uLCBpdCBtaWdodCBoYXZlIGJlZW4g cmVtb3ZlZCBmcm9tIGVkaXRpbmcgYnkgdGhlIHVzZXIuCiAgICAgICAgIC8vIElmIHRoZSBwb3Np dGlvbiBpcyBpbnZhbGlkZSwgcmV2YWxpZGF0ZSBhbGwgcG9zaXRpb25zIHJldmVhbCBhcyBuZWVk ZWQuCkBAIC0xMDc4LDUwICsxMDc4LDU1IEBAIFdJLlRleHRFZGl0b3IgPSBjbGFzcyBUZXh0RWRp dG9yIGV4dGVuZHMgV0kuVmlldwogICAgICAgICBpZiAoY2hhbmdlRm9jdXMpCiAgICAgICAgICAg ICB0aGlzLl9jb2RlTWlycm9yLmZvY3VzKCk7CiAKKyAgICAgICAgLy8gQ29sbGVjdCBpbmZvIGZv ciB0aGUgYm91bmN5IGhpZ2hsaWdodC4KKyAgICAgICAgbGV0IGhpZ2hsaWdodEVkaXRvclBvc2l0 aW9uID0gdGhpcy5fY29kZU1pcnJvci5nZXRDdXJzb3IoInN0YXJ0Iik7CisgICAgICAgIGxldCB0 ZXh0Q29udGVudCA9IHRoaXMuX2NvZGVNaXJyb3IuZ2V0U2VsZWN0aW9uKCk7CisKICAgICAgICAg Ly8gUmVtb3ZlIHRoZSBib3VuY3kgaGlnaGxpZ2h0IGlmIGl0IGlzIHN0aWxsIGFyb3VuZC4gVGhl IGFuaW1hdGlvbiB3aWxsIG5vdAogICAgICAgICAvLyBzdGFydCB1bmxlc3Mgd2UgcmVtb3ZlIGl0 IGFuZCBhZGQgaXQgYmFjayB0byB0aGUgZG9jdW1lbnQuCi0gICAgICAgIGlmICh0aGlzLl9ib3Vu Y3lIaWdobGlnaHRFbGVtZW50KQotICAgICAgICAgICAgdGhpcy5fYm91bmN5SGlnaGxpZ2h0RWxl bWVudC5yZW1vdmUoKTsKKyAgICAgICAgdGhpcy5fcmVtb3ZlQm91bmN5SGlnaGxpZ2h0RWxlbWVu dElmTmVlZGVkKCk7CiAKICAgICAgICAgLy8gQ3JlYXRlIHRoZSBib3VuY3kgaGlnaGxpZ2h0Lgog ICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQuY2xhc3NO YW1lID0gV0kuVGV4dEVkaXRvci5Cb3VuY3lIaWdobGlnaHRTdHlsZUNsYXNzTmFtZTsKLQotICAg ICAgICAvLyBDb2xsZWN0IGluZm8gZm9yIHRoZSBib3VuY3kgaGlnaGxpZ2h0LgotICAgICAgICB2 YXIgdGV4dENvbnRlbnQgPSB0aGlzLl9jb2RlTWlycm9yLmdldFNlbGVjdGlvbigpOwotICAgICAg ICB2YXIgY29vcmRpbmF0ZXMgPSB0aGlzLl9jb2RlTWlycm9yLmN1cnNvckNvb3Jkcyh0cnVlLCAi cGFnZSIpOwotCi0gICAgICAgIC8vIEFkanVzdCB0aGUgY29vcmRpbmF0ZXMgdG8gYmUgYmFzZWQg aW4gdGhlIHRleHQgZWRpdG9yJ3Mgc3BhY2UuCi0gICAgICAgIGxldCB0ZXh0RWRpdG9yUmVjdCA9 IHRoaXMuZWxlbWVudC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKLSAgICAgICAgY29vcmRpbmF0 ZXMudG9wIC09IHRleHRFZGl0b3JSZWN0LnRvcDsKLSAgICAgICAgY29vcmRpbmF0ZXMubGVmdCAt PSB0ZXh0RWRpdG9yUmVjdC5sZWZ0OwotCi0gICAgICAgIC8vIFBvc2l0aW9uIGFuZCBzaG93IHRo ZSBib3VuY3kgaGlnaGxpZ2h0LgogICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50 LnRleHRDb250ZW50ID0gdGV4dENvbnRlbnQ7Ci0gICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdo dEVsZW1lbnQuc3R5bGUudG9wID0gY29vcmRpbmF0ZXMudG9wICsgInB4IjsKLSAgICAgICAgdGhp cy5fYm91bmN5SGlnaGxpZ2h0RWxlbWVudC5zdHlsZS5sZWZ0ID0gY29vcmRpbmF0ZXMubGVmdCAr ICJweCI7CisKKyAgICAgICAgZnVuY3Rpb24gcG9zaXRpb25Cb3VuY3lIaWdobGlnaHQoKSB7Cisg ICAgICAgICAgICAvLyBBZGp1c3QgdGhlIGNvb3JkaW5hdGVzIHRvIGJlIGJhc2VkIGluIHRoZSB0 ZXh0IGVkaXRvcidzIHNwYWNlLgorICAgICAgICAgICAgbGV0IGNvb3JkaW5hdGVzID0gdGhpcy5f Y29kZU1pcnJvci5jdXJzb3JDb29yZHMoaGlnaGxpZ2h0RWRpdG9yUG9zaXRpb24sICJwYWdlIik7 CisgICAgICAgICAgICBsZXQgdGV4dEVkaXRvclJlY3QgPSB0aGlzLmVsZW1lbnQuZ2V0Qm91bmRp bmdDbGllbnRSZWN0KCk7CisgICAgICAgICAgICBjb29yZGluYXRlcy50b3AgLT0gdGV4dEVkaXRv clJlY3QudG9wOworICAgICAgICAgICAgY29vcmRpbmF0ZXMubGVmdCAtPSB0ZXh0RWRpdG9yUmVj dC5sZWZ0OworCisgICAgICAgICAgICAvLyBQb3NpdGlvbiB0aGUgYm91bmN5IGhpZ2hsaWdodC4K KyAgICAgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQuc3R5bGUudG9wID0gY29v cmRpbmF0ZXMudG9wICsgInB4IjsKKyAgICAgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVs ZW1lbnQuc3R5bGUubGVmdCA9IGNvb3JkaW5hdGVzLmxlZnQgKyAicHgiOworICAgICAgICB9CisK KyAgICAgICAgLy8gUG9zaXRpb24gYW5kIHNob3cgdGhlIGhpZ2hsaWdodC4KKyAgICAgICAgcG9z aXRpb25Cb3VuY3lIaWdobGlnaHQuY2FsbCh0aGlzKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQpOwogCi0gICAgICAgIGxldCBz Y3JvbGxIYW5kbGVyID0gKCkgPT4gewotICAgICAgICAgICAgaWYgKHRoaXMuX2JvdW5jeUhpZ2hs aWdodEVsZW1lbnQpCi0gICAgICAgICAgICAgICAgdGhpcy5fYm91bmN5SGlnaGxpZ2h0RWxlbWVu dC5yZW1vdmUoKTsKLSAgICAgICAgfTsKLQotICAgICAgICB0aGlzLmFkZFNjcm9sbEhhbmRsZXIo c2Nyb2xsSGFuZGxlcik7Ci0KLSAgICAgICAgZnVuY3Rpb24gYW5pbWF0aW9uRW5kZWQoKQotICAg ICAgICB7Ci0gICAgICAgICAgICBpZiAoIXRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQpCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGln aHRFbGVtZW50LnJlbW92ZSgpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2JvdW5jeUhpZ2hs aWdodEVsZW1lbnQ7Ci0KLSAgICAgICAgICAgIHRoaXMucmVtb3ZlU2Nyb2xsSGFuZGxlcihzY3Jv bGxIYW5kbGVyKTsKLSAgICAgICAgfQorICAgICAgICAvLyBSZXBvc2l0aW9uIHRoZSBoaWdobGln aHQgaWYgdGhlIGVkaXRvciBzY3JvbGxzLgorICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRT Y3JvbGxIYW5kbGVyID0gKCkgPT4geyBwb3NpdGlvbkJvdW5jeUhpZ2hsaWdodC5jYWxsKHRoaXMp OyB9OworICAgICAgICB0aGlzLmFkZFNjcm9sbEhhbmRsZXIodGhpcy5fYm91bmN5SGlnaGxpZ2h0 U2Nyb2xsSGFuZGxlcik7CiAKICAgICAgICAgLy8gTGlzdGVuIGZvciB0aGUgZW5kIG9mIHRoZSBh bmltYXRpb24gc28gd2UgY2FuIHJlbW92ZSB0aGUgZWxlbWVudC4KLSAgICAgICAgdGhpcy5fYm91 bmN5SGlnaGxpZ2h0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJhbmltYXRpb25lbmQiLCBhbmlt YXRpb25FbmRlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fYm91bmN5SGlnaGxpZ2h0RWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJhbmltYXRpb25lbmQiLCAoKSA9PiB7CisgICAgICAgICAg ICB0aGlzLl9yZW1vdmVCb3VuY3lIaWdobGlnaHRFbGVtZW50SWZOZWVkZWQoKTsKKyAgICAgICAg fSk7CisgICAgfQorCisgICAgX3JlbW92ZUJvdW5jeUhpZ2hsaWdodEVsZW1lbnRJZk5lZWRlZCgp CisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQpCisgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5yZW1vdmVTY3JvbGxIYW5kbGVyKHRoaXMu X2JvdW5jeUhpZ2hsaWdodFNjcm9sbEhhbmRsZXIpOworICAgICAgICB0aGlzLl9ib3VuY3lIaWdo bGlnaHRTY3JvbGxIYW5kbGVyID0gbnVsbDsKKworICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGln aHRFbGVtZW50LnJlbW92ZSgpOworICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50 ID0gbnVsbDsKICAgICB9CiAKICAgICBfYmluYXJ5U2VhcmNoSW5zZXJ0aW9uSW5kZXhJblNlYXJj aFJlc3VsdHMob2JqZWN0LCBjb21wYXJhdG9yKQo=