211164 2020-04-28 22:52:57 -0700 Web Inspector: don't immediately attempt to perform a search whenever the find string changes 2020-04-29 07:50:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 113588 1 hi hi hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1646852 0 hi 2020-04-28 22:52:57 -0700 # STEPS TO REPRODUCE 1. inspect any page 2. go to the Console Tab 3. highlight `foo` and press ⌘E 4. focus Web Inspector => the filter in the split console changes to show `foo` We shouldn't change the filter until the user presses ⌘G or ⇧⌘G. 1646858 1 397928 hi 2020-04-28 23:09:27 -0700 Created attachment 397928 Patch 1646875 2 397928 joepeck 2020-04-28 23:44:18 -0700 Comment on attachment 397928 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397928&action=review > Source/WebInspectorUI/ChangeLog:16 > + (WI.LogContentView.prototype.handleFindStringUpdated): Deleted. > + Only update the `searchQuery` of the `WI.FindBanner` and `performSearch` when the find > + next/previous keyboard shortcut is activated, not when the find string is populated/updated. This doesn't sound like it matches macOS System behavior. For example, in a Safari Tab. 1. Show Find Banner (⌘F) 2. Type some text in there "foo" 3. Highlight some text on the page (<-- like this line) 4. Populate Search Pasteboard (⌘E) => Immediately the find banner contents update, a search is not yet performed but the contents have updated. 1646886 3 397928 hi 2020-04-29 00:19:44 -0700 Comment on attachment 397928 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397928&action=review >> Source/WebInspectorUI/ChangeLog:16 >> + next/previous keyboard shortcut is activated, not when the find string is populated/updated. > > This doesn't sound like it matches macOS System behavior. > > For example, in a Safari Tab. > 1. Show Find Banner (⌘F) > 2. Type some text in there "foo" > 3. Highlight some text on the page (<-- like this line) > 4. Populate Search Pasteboard (⌘E) > => Immediately the find banner contents update, a search is not yet performed but the contents have updated. As we discussed offline, this is not really possible in Web Inspector because we use an `<input type="search">` which automatically fires a `"search"` event after 1s (or something like that), meaning that if we update the value we will cause a new search to happen. As you suggested offline, we could change the `type` of the `<input>` to `"text"`, change the `value`, and then change the `type` back to `search`, but that would mean that we now have to maintain a state of "the search query has been updated but we haven't searched with the new string yet", which might not be that easy. Furthermore, Web Inspector has a different find UI than Safari (a dark layer with holes) or Xcode (bounce the next result once) in that we persist a highlight of all matches (even after interacting with the content view), which I believe could lead to a confusing scenario where the things that are highlighted don't match what's in the find banner. With that having been said, however, this patch does have one problem in that it doesn't preform a search when ⌘E is pressed, meaning if the find banner is showing, the match count won't update, which is a problem. 1646888 4 397936 hi 2020-04-29 00:26:20 -0700 Created attachment 397936 Patch 1646990 5 ews-feeder 2020-04-29 07:49:07 -0700 Committed r260895: <https://trac.webkit.org/changeset/260895> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397936. 1646992 6 webkit-bug-importer 2020-04-29 07:50:17 -0700 <rdar://problem/62599550> 397928 2020-04-28 23:09:27 -0700 2020-04-29 00:26:18 -0700 Patch 211164.diff text/plain 6458 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY1Y2E0MGE0NTZjLi41MzY0YWJlMjI4YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMDQtMjggIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRv bid0IGltbWVkaWF0ZWx5IGF0dGVtcHQgdG8gcGVyZm9ybSBhIHNlYXJjaCB3aGVuZXZlciB0aGUg ZmluZCBzdHJpbmcgY2hhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjExMTY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdJLnVw ZGF0ZUZpbmRTdHJpbmcpOgorICAgICAgICAoV0kuX3BvcHVsYXRlRmluZCk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qczoKKyAgICAgICAgKFdJLkNvbnRl bnRCcm93c2VyLnByb3RvdHlwZS5oYW5kbGVGaW5kU3RyaW5nVXBkYXRlZCk6IERlbGV0ZWQuCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5oYW5kbGVGaW5kU3RyaW5nVXBkYXRlZCk6IERl bGV0ZWQuCisgICAgICAgIE9ubHkgdXBkYXRlIHRoZSBgc2VhcmNoUXVlcnlgIG9mIHRoZSBgV0ku RmluZEJhbm5lcmAgYW5kIGBwZXJmb3JtU2VhcmNoYCB3aGVuIHRoZSBmaW5kCisgICAgICAgIG5l eHQvcHJldmlvdXMga2V5Ym9hcmQgc2hvcnRjdXQgaXMgYWN0aXZhdGVkLCBub3Qgd2hlbiB0aGUg ZmluZCBzdHJpbmcgaXMgcG9wdWxhdGVkL3VwZGF0ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qczoKKyAgICAgICAg KFdJLkphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5wcm90b3R5cGUuX2hhbmRsZUZpbmROZXh0 U2hvcnRjdXQpOgorICAgICAgICAoV0kuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3Rv dHlwZS5faGFuZGxlRmluZFByZXZpb3VzU2hvcnRjdXQpOgorICAgICAgICBDYWxsIGEgZGlmZmVy ZW50IGRlbGVnYXRlIGZ1bmN0aW9uIHNvIHRoYXQgbG9naWMgZm9yIHBlcmZvcm1pbmcgYSBzZWFy Y2ggaWYgdGhlIGBzZWFyY2hRdWVyeWAKKyAgICAgICAgb2YgdGhlIGBXSS5GaW5kQmFubmVyYCBk b2Vzbid0IG1hdGNoIHRoZSBjdXJyZW50IGBXSS5maW5kU3RyaW5nYCBpcyBhbHNvIHBlcmZvcm1l ZCB3aGVuCisgICAgICAgIGxvb2tpbmcgYXQgdGhlIHNwbGl0IGNvbnNvbGUuCisKIDIwMjAtMDQt MjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGZpbmQgZGlhbG9nIGRvZXMgbm90IHBvcHVsYXRlIHNlYXJjaCBzdHJpbmcgZnJvbSBz eXN0ZW0gZmluZCBwYXN0ZWJvYXJkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggMDY0OTc1NjA2YWIuLjI0N2I5NjQ3NTk4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBA IC0xMDQ3LDIyICsxMDQ3LDEwIEBAIFdJLnVwZGF0ZVZpc2liaWxpdHlTdGF0ZSA9IGZ1bmN0aW9u KHZpc2libGUpCiAKIFdJLnVwZGF0ZUZpbmRTdHJpbmcgPSBmdW5jdGlvbihmaW5kU3RyaW5nKQog ewotICAgIGlmIChXSS5maW5kU3RyaW5nID09PSBmaW5kU3RyaW5nKQorICAgIGlmICghZmluZFN0 cmluZyB8fCBXSS5maW5kU3RyaW5nID09PSBmaW5kU3RyaW5nKQogICAgICAgICByZXR1cm47CiAK ICAgICBXSS5maW5kU3RyaW5nID0gZmluZFN0cmluZzsKLQotICAgIGxldCBmb2N1c2VkQ29udGVu dFZpZXcgPSBXSS5fZm9jdXNlZENvbnRlbnRWaWV3KCk7Ci0gICAgaWYgKGZvY3VzZWRDb250ZW50 VmlldyAmJiBmb2N1c2VkQ29udGVudFZpZXcuc3VwcG9ydHNDdXN0b21GaW5kQmFubmVyKSB7Ci0g ICAgICAgIGZvY3VzZWRDb250ZW50Vmlldy5oYW5kbGVGaW5kU3RyaW5nVXBkYXRlZCgpOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbGV0IGNvbnRlbnRCcm93c2VyID0gV0kuX2ZvY3Vz ZWRPclZpc2libGVDb250ZW50QnJvd3NlcigpOwotICAgIGlmIChjb250ZW50QnJvd3Nlcikgewot ICAgICAgICBjb250ZW50QnJvd3Nlci5oYW5kbGVGaW5kU3RyaW5nVXBkYXRlZCgpOwotICAgICAg ICByZXR1cm47Ci0gICAgfQogfTsKIAogV0kuaGFuZGxlUG9zc2libGVMaW5rQ2xpY2sgPSBmdW5j dGlvbihldmVudCwgZnJhbWUsIG9wdGlvbnMgPSB7fSkKQEAgLTI2MzQsNyArMjYyMiw2IEBAIFdJ Ll9wb3B1bGF0ZUZpbmQgPSBmdW5jdGlvbihldmVudCkKICAgICAgICAgbGV0IHN0cmluZyA9IGZv Y3VzZWRDb250ZW50Vmlldy5oYW5kbGVQb3B1bGF0ZUZpbmRTaG9ydGN1dCgpOwogICAgICAgICBp ZiAoc3RyaW5nKQogICAgICAgICAgICAgV0kuZmluZFN0cmluZyA9IHN0cmluZzsKLSAgICAgICAg Zm9jdXNlZENvbnRlbnRWaWV3LmhhbmRsZUZpbmRTdHJpbmdVcGRhdGVkKCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKQEAgLTI2NDMsNyArMjYzMCw2IEBAIFdJLl9wb3B1bGF0ZUZpbmQgPSBm dW5jdGlvbihldmVudCkKICAgICAgICAgbGV0IHN0cmluZyA9IGNvbnRlbnRCcm93c2VyLmhhbmRs ZVBvcHVsYXRlRmluZFNob3J0Y3V0KCk7CiAgICAgICAgIGlmIChzdHJpbmcpCiAgICAgICAgICAg ICBXSS5maW5kU3RyaW5nID0gc3RyaW5nOwotICAgICAgICBjb250ZW50QnJvd3Nlci5oYW5kbGVG aW5kU3RyaW5nVXBkYXRlZCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogfTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFT Y3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcwppbmRleCA3 NzJiNmZlZDNlMy4uMWE5OTBiOThiOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9K YXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKQEAgLTI1MywxMiArMjUzLDEyIEBAIFdJLkph dmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29udHJv bGxlciBleHRlbmRzIFdJLk9iCiAKICAgICBfaGFuZGxlRmluZE5leHRTaG9ydGN1dCgpCiAgICAg ewotICAgICAgICB0aGlzLmRlbGVnYXRlLmhpZ2hsaWdodE5leHRTZWFyY2hNYXRjaCgpOworICAg ICAgICB0aGlzLmRlbGVnYXRlLmhhbmRsZUZpbmROZXh0U2hvcnRjdXQoKTsKICAgICB9CiAKICAg ICBfaGFuZGxlRmluZFByZXZpb3VzU2hvcnRjdXQoKQogICAgIHsKLSAgICAgICAgdGhpcy5kZWxl Z2F0ZS5oaWdobGlnaHRQcmV2aW91c1NlYXJjaE1hdGNoKCk7CisgICAgICAgIHRoaXMuZGVsZWdh dGUuaGFuZGxlRmluZFByZXZpb3VzU2hvcnRjdXQoKTsKICAgICB9CiAKICAgICBfYXBwZW5kQ29u c29sZU1lc3NhZ2VWaWV3KG1lc3NhZ2VWaWV3LCByZXBlYXRDb3VudFdhc0ludGVycnVwdGVkKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCA3NWQ5NzhkMmViYi4uMTRmNTg4OTZlODEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRC cm93c2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbnRlbnRCcm93c2VyLmpzCkBAIC0yNDYsMTUgKzI0Niw2IEBAIFdJLkNvbnRlbnRCcm93c2Vy ID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICAvLyBHbG9iYWwg Q29udGVudEJyb3dzZXIgS2V5Ym9hcmRTaG9ydGN1dCBoYW5kbGVycwogCi0gICAgaGFuZGxlRmlu ZFN0cmluZ1VwZGF0ZWQoKQotICAgIHsKLSAgICAgICAgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hR dWVyeSA9IFdJLmZpbmRTdHJpbmc7Ci0KLSAgICAgICAgbGV0IGN1cnJlbnRDb250ZW50VmlldyA9 IHRoaXMuY3VycmVudENvbnRlbnRWaWV3OwotICAgICAgICBpZiAoY3VycmVudENvbnRlbnRWaWV3 Py5zdXBwb3J0c1NlYXJjaCkKLSAgICAgICAgICAgIGN1cnJlbnRDb250ZW50Vmlldy5wZXJmb3Jt U2VhcmNoKHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkpOwotICAgIH0KLQogICAgIGhhbmRs ZVBvcHVsYXRlRmluZFNob3J0Y3V0KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLmN1cnJl bnRDb250ZW50Vmlldz8uc2VhcmNoUXVlcnlXaXRoU2VsZWN0aW9uKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzCmluZGV4IDE1MmI4YTEwMDMwLi5mNzFkYjQwNDg1YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZp ZXcuanMKQEAgLTI5NiwxMyArMjk2LDYgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dD b250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2xvZ1ZpZXdD b250cm9sbGVyLnJlcXVlc3RDbGVhck1lc3NhZ2VzKCk7CiAgICAgfQogCi0gICAgaGFuZGxlRmlu ZFN0cmluZ1VwZGF0ZWQoKQotICAgIHsKLSAgICAgICAgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hR dWVyeSA9IFdJLmZpbmRTdHJpbmc7Ci0KLSAgICAgICAgdGhpcy5wZXJmb3JtU2VhcmNoKHRoaXMu X2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkpOwotICAgIH0KLQogICAgIGhhbmRsZVBvcHVsYXRlRmlu ZFNob3J0Y3V0KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLnNlYXJjaFF1ZXJ5V2l0aFNl bGVjdGlvbigpOwpAQCAtMzEwLDE2ICszMDMsMjIgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFz cyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAKICAgICBoYW5kbGVGaW5k TmV4dFNob3J0Y3V0KCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9maW5kQmFubmVyLnNlYXJj aFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKQotICAgICAgICAgICAgdGhpcy5oYW5kbGVGaW5kU3Ry aW5nVXBkYXRlZCgpOworICAgICAgICBpZiAodGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSAh PT0gV0kuZmluZFN0cmluZykgeworICAgICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hR dWVyeSA9IFdJLmZpbmRTdHJpbmc7CisKKyAgICAgICAgICAgIHRoaXMucGVyZm9ybVNlYXJjaCh0 aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5KTsKKyAgICAgICAgfQogCiAgICAgICAgIHRoaXMu ZmluZEJhbm5lclJldmVhbE5leHRSZXN1bHQodGhpcy5fZmluZEJhbm5lcik7CiAgICAgfQogCiAg ICAgaGFuZGxlRmluZFByZXZpb3VzU2hvcnRjdXQoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMu X2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkgIT09IFdJLmZpbmRTdHJpbmcpCi0gICAgICAgICAgICB0 aGlzLmhhbmRsZUZpbmRTdHJpbmdVcGRhdGVkKCk7CisgICAgICAgIGlmICh0aGlzLl9maW5kQmFu bmVyLnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSB7CisgICAgICAgICAgICB0aGlzLl9m aW5kQmFubmVyLnNlYXJjaFF1ZXJ5ID0gV0kuZmluZFN0cmluZzsKKworICAgICAgICAgICAgdGhp cy5wZXJmb3JtU2VhcmNoKHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkpOworICAgICAgICB9 CiAKICAgICAgICAgdGhpcy5maW5kQmFubmVyUmV2ZWFsUHJldmlvdXNSZXN1bHQodGhpcy5fZmlu ZEJhbm5lcik7CiAgICAgfQo= 397936 2020-04-29 00:26:20 -0700 2020-04-29 07:49:08 -0700 Patch bug-211164-20200429012619.patch text/plain 7814 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDlkMzZmMmZlOTlmOWRlMzZlNmUwZmIzYTc5ZTRl NjgxNWQ2ZTc4MzIuLjM4MmNiY2Y5OTFkZWEzY2RkYTcxY2NhY2IxZDQ0YzBhNThjOTIzZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTI4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBk b24ndCBpbW1lZGlhdGVseSBhdHRlbXB0IHRvIHBlcmZvcm0gYSBzZWFyY2ggd2hlbmV2ZXIgdGhl IGZpbmQgc3RyaW5nIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxMTE2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS51 cGRhdGVGaW5kU3RyaW5nKToKKyAgICAgICAgKFdJLl9wb3B1bGF0ZUZpbmQpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChXSS5Db250 ZW50QnJvd3Nlci5wcm90b3R5cGUuaGFuZGxlUG9wdWxhdGVGaW5kU2hvcnRjdXQpOgorICAgICAg ICAoV0kuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLmhhbmRsZUZpbmRTdHJpbmdVcGRhdGVkKTog RGVsZXRlZC4KKyAgICAgICAgT25seSB1cGRhdGUgdGhlIGBzZWFyY2hRdWVyeWAgb2YgdGhlIGBX SS5GaW5kQmFubmVyYCBhbmQgYHBlcmZvcm1TZWFyY2hgIHdoZW4gdGhlIGZpbmQKKyAgICAgICAg bmV4dC9wcmV2aW91cyBrZXlib2FyZCBzaG9ydGN1dCBpcyBhY3RpdmF0ZWQsIG5vdCB3aGVuIHRo ZSBmaW5kIHN0cmluZyBpcyBwb3B1bGF0ZWQvdXBkYXRlZCwKKyAgICAgICAgdW5sZXNzIHRoZSB1 cGRhdGUgY2FtZSBmcm9tIHRoZSBwb3B1bGF0ZSBmaW5kIGtleWJvYXJkIHNob3J0Y3V0LgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5oYW5kbGVQb3B1bGF0ZUZpbmRTaG9ydGN1dCk6 CisgICAgICAgIChXSS5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuaGFuZGxlRmluZE5leHRTaG9y dGN1dCk6CisgICAgICAgIChXSS5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuaGFuZGxlRmluZFBy ZXZpb3VzU2hvcnRjdXQpOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLmhp Z2hsaWdodFByZXZpb3VzU2VhcmNoTWF0Y2gpOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcu cHJvdG90eXBlLmhpZ2hsaWdodE5leHRTZWFyY2hNYXRjaCk6CisgICAgICAgIChXSS5Mb2dDb250 ZW50Vmlldy5wcm90b3R5cGUuaGFuZGxlRmluZFN0cmluZ1VwZGF0ZWQpOiBEZWxldGVkLgorICAg ICAgICBFbnN1cmUgdGhhdCB0aGUgbG9naWMgZm9yIHBlcmZvcm1pbmcgYSBzZWFyY2ggaWYgdGhl IGBzZWFyY2hRdWVyeWAgb2YgdGhlIGBXSS5GaW5kQmFubmVyYAorICAgICAgICBkb2Vzbid0IG1h dGNoIHRoZSBjdXJyZW50IGBXSS5maW5kU3RyaW5nYCBpcyBhbHNvIHBlcmZvcm1lZCB3aGVuIGlu IHRoZSBzcGxpdCBjb25zb2xlLgorCiAyMDIwLTA0LTI4ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFz aWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERlYnVnOiAiT3V0bGlu ZSBmb2N1c2VkIGVsZW1lbnQiIHNob3VsZCBhbHNvIG91dGxpbmUgZWxlbWVudHMgd2l0aCB0YWJJ bmRleD0wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKaW5kZXggMDY0OTc1NjA2YWJmNDEwOTg5NDQ1MzRjMWNlYzhiZjhiN2QyYmZkMy4uNGJj NjJiMzQwZmM5YmI5OWQ5MjM1Y2E0YTcwODhlOTA4ZjA3ZDA2YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMTA0NywyMiArMTA0 NywxMiBAQCBXSS51cGRhdGVWaXNpYmlsaXR5U3RhdGUgPSBmdW5jdGlvbih2aXNpYmxlKQogCiBX SS51cGRhdGVGaW5kU3RyaW5nID0gZnVuY3Rpb24oZmluZFN0cmluZykKIHsKLSAgICBpZiAoV0ku ZmluZFN0cmluZyA9PT0gZmluZFN0cmluZykKLSAgICAgICAgcmV0dXJuOworICAgIGlmICghZmlu ZFN0cmluZyB8fCBXSS5maW5kU3RyaW5nID09PSBmaW5kU3RyaW5nKQorICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICBXSS5maW5kU3RyaW5nID0gZmluZFN0cmluZzsKIAotICAgIGxldCBmb2N1 c2VkQ29udGVudFZpZXcgPSBXSS5fZm9jdXNlZENvbnRlbnRWaWV3KCk7Ci0gICAgaWYgKGZvY3Vz ZWRDb250ZW50VmlldyAmJiBmb2N1c2VkQ29udGVudFZpZXcuc3VwcG9ydHNDdXN0b21GaW5kQmFu bmVyKSB7Ci0gICAgICAgIGZvY3VzZWRDb250ZW50Vmlldy5oYW5kbGVGaW5kU3RyaW5nVXBkYXRl ZCgpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbGV0IGNvbnRlbnRCcm93c2VyID0g V0kuX2ZvY3VzZWRPclZpc2libGVDb250ZW50QnJvd3NlcigpOwotICAgIGlmIChjb250ZW50QnJv d3NlcikgewotICAgICAgICBjb250ZW50QnJvd3Nlci5oYW5kbGVGaW5kU3RyaW5nVXBkYXRlZCgp OwotICAgICAgICByZXR1cm47Ci0gICAgfQorICAgIHJldHVybiB0cnVlOwogfTsKIAogV0kuaGFu ZGxlUG9zc2libGVMaW5rQ2xpY2sgPSBmdW5jdGlvbihldmVudCwgZnJhbWUsIG9wdGlvbnMgPSB7 fSkKQEAgLTI2MzEsMTkgKzI2MjEsMTMgQEAgV0kuX3BvcHVsYXRlRmluZCA9IGZ1bmN0aW9uKGV2 ZW50KQogewogICAgIGxldCBmb2N1c2VkQ29udGVudFZpZXcgPSBXSS5fZm9jdXNlZENvbnRlbnRW aWV3KCk7CiAgICAgaWYgKGZvY3VzZWRDb250ZW50VmlldyAmJiBmb2N1c2VkQ29udGVudFZpZXcu c3VwcG9ydHNDdXN0b21GaW5kQmFubmVyKSB7Ci0gICAgICAgIGxldCBzdHJpbmcgPSBmb2N1c2Vk Q29udGVudFZpZXcuaGFuZGxlUG9wdWxhdGVGaW5kU2hvcnRjdXQoKTsKLSAgICAgICAgaWYgKHN0 cmluZykKLSAgICAgICAgICAgIFdJLmZpbmRTdHJpbmcgPSBzdHJpbmc7Ci0gICAgICAgIGZvY3Vz ZWRDb250ZW50Vmlldy5oYW5kbGVGaW5kU3RyaW5nVXBkYXRlZCgpOworICAgICAgICBmb2N1c2Vk Q29udGVudFZpZXcuaGFuZGxlUG9wdWxhdGVGaW5kU2hvcnRjdXQoKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAogICAgIGxldCBjb250ZW50QnJvd3NlciA9IFdJLl9mb2N1c2VkT3JWaXNpYmxl Q29udGVudEJyb3dzZXIoKTsKICAgICBpZiAoY29udGVudEJyb3dzZXIpIHsKLSAgICAgICAgbGV0 IHN0cmluZyA9IGNvbnRlbnRCcm93c2VyLmhhbmRsZVBvcHVsYXRlRmluZFNob3J0Y3V0KCk7Ci0g ICAgICAgIGlmIChzdHJpbmcpCi0gICAgICAgICAgICBXSS5maW5kU3RyaW5nID0gc3RyaW5nOwot ICAgICAgICBjb250ZW50QnJvd3Nlci5oYW5kbGVGaW5kU3RyaW5nVXBkYXRlZCgpOworICAgICAg ICBjb250ZW50QnJvd3Nlci5oYW5kbGVQb3B1bGF0ZUZpbmRTaG9ydGN1dCgpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKaW5kZXggNzVkOTc4ZDJlYmI3 ZDVjYjVkYjk4ZTJlYjNkOGM3N2M3MWUyYzI2Yi4uMDQ5YTQ3MTQ1NWIwNTM5ZmQ5OTBlYTQxZTYz OTM4Mzk4NWUzNGVkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKQEAgLTI0NiwxOCArMjQ2LDE4 IEBAIFdJLkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5W aWV3CiAKICAgICAvLyBHbG9iYWwgQ29udGVudEJyb3dzZXIgS2V5Ym9hcmRTaG9ydGN1dCBoYW5k bGVycwogCi0gICAgaGFuZGxlRmluZFN0cmluZ1VwZGF0ZWQoKQotICAgIHsKLSAgICAgICAgdGhp cy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSA9IFdJLmZpbmRTdHJpbmc7Ci0KLSAgICAgICAgbGV0 IGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3VycmVudENvbnRlbnRWaWV3OwotICAgICAgICBp ZiAoY3VycmVudENvbnRlbnRWaWV3Py5zdXBwb3J0c1NlYXJjaCkKLSAgICAgICAgICAgIGN1cnJl bnRDb250ZW50Vmlldy5wZXJmb3JtU2VhcmNoKHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkp OwotICAgIH0KLQogICAgIGhhbmRsZVBvcHVsYXRlRmluZFNob3J0Y3V0KCkKICAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLmN1cnJlbnRDb250ZW50Vmlldz8uc2VhcmNoUXVlcnlXaXRoU2VsZWN0 aW9uKCk7CisgICAgICAgIGxldCBjdXJyZW50Q29udGVudFZpZXcgPSB0aGlzLmN1cnJlbnRDb250 ZW50VmlldzsKKyAgICAgICAgaWYgKCFjdXJyZW50Q29udGVudFZpZXc/LnN1cHBvcnRzU2VhcmNo KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICghV0kudXBkYXRlRmluZFN0cmlu ZyhjdXJyZW50Q29udGVudFZpZXcuc2VhcmNoUXVlcnlXaXRoU2VsZWN0aW9uKCkpKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkgPSBX SS5maW5kU3RyaW5nOworCisgICAgICAgIGN1cnJlbnRDb250ZW50Vmlldy5wZXJmb3JtU2VhcmNo KHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkpOwogICAgIH0KIAogICAgIGFzeW5jIGhhbmRs ZUZpbmROZXh0U2hvcnRjdXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwppbmRleCAxNTJiOGExMDAz MGUxYmYzYjRkOThjNjQ1YzMzZGIzZmQ5Yzg2MDllLi41NjgwOWZjYWM0ZTBhNzdhMGM3Y2QzMWMx MDI1YmZjZWFiN2E0ZTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwpAQCAtMjk2LDMyICsyOTYs MjQgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLnJlcXVlc3RDbGVh ck1lc3NhZ2VzKCk7CiAgICAgfQogCi0gICAgaGFuZGxlRmluZFN0cmluZ1VwZGF0ZWQoKQorICAg IGhhbmRsZVBvcHVsYXRlRmluZFNob3J0Y3V0KCkKICAgICB7CisgICAgICAgIGlmICghV0kudXBk YXRlRmluZFN0cmluZyh0aGlzLnNlYXJjaFF1ZXJ5V2l0aFNlbGVjdGlvbigpKSkKKyAgICAgICAg ICAgIHJldHVybjsKKwogICAgICAgICB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5ID0gV0ku ZmluZFN0cmluZzsKIAogICAgICAgICB0aGlzLnBlcmZvcm1TZWFyY2godGhpcy5fZmluZEJhbm5l ci5zZWFyY2hRdWVyeSk7CiAgICAgfQogCi0gICAgaGFuZGxlUG9wdWxhdGVGaW5kU2hvcnRjdXQo KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuc2VhcmNoUXVlcnlXaXRoU2VsZWN0aW9uKCk7 Ci0gICAgfQotCiAgICAgaGFuZGxlRmluZE5leHRTaG9ydGN1dCgpCiAgICAgewotICAgICAgICBp ZiAodGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSAhPT0gV0kuZmluZFN0cmluZykKLSAgICAg ICAgICAgIHRoaXMuaGFuZGxlRmluZFN0cmluZ1VwZGF0ZWQoKTsKLQotICAgICAgICB0aGlzLmZp bmRCYW5uZXJSZXZlYWxOZXh0UmVzdWx0KHRoaXMuX2ZpbmRCYW5uZXIpOworICAgICAgICB0aGlz LmhpZ2hsaWdodE5leHRTZWFyY2hNYXRjaCgpOwogICAgIH0KIAogICAgIGhhbmRsZUZpbmRQcmV2 aW91c1Nob3J0Y3V0KCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9maW5kQmFubmVyLnNlYXJj aFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKQotICAgICAgICAgICAgdGhpcy5oYW5kbGVGaW5kU3Ry aW5nVXBkYXRlZCgpOwotCi0gICAgICAgIHRoaXMuZmluZEJhbm5lclJldmVhbFByZXZpb3VzUmVz dWx0KHRoaXMuX2ZpbmRCYW5uZXIpOworICAgICAgICB0aGlzLmhpZ2hsaWdodFByZXZpb3VzU2Vh cmNoTWF0Y2goKTsKICAgICB9CiAKICAgICBmaW5kQmFubmVyUmV2ZWFsUHJldmlvdXNSZXN1bHQo KQpAQCAtMzMxLDcgKzMyMywxMyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRl bnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgIGhpZ2hsaWdodFByZXZpb3VzU2Vh cmNoTWF0Y2goKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLmhhc1BlcmZvcm1lZFNlYXJjaCB8 fCBpc0VtcHR5T2JqZWN0KHRoaXMuX3NlYXJjaE1hdGNoZXMpKQorICAgICAgICBpZiAoIXRoaXMu aGFzUGVyZm9ybWVkU2VhcmNoIHx8IHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkgIT09IFdJ LmZpbmRTdHJpbmcpIHsKKyAgICAgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkg PSBXSS5maW5kU3RyaW5nOworCisgICAgICAgICAgICB0aGlzLnBlcmZvcm1TZWFyY2godGhpcy5f ZmluZEJhbm5lci5zZWFyY2hRdWVyeSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoaXNFbXB0 eU9iamVjdCh0aGlzLl9zZWFyY2hNYXRjaGVzKSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAg ICAgICB2YXIgaW5kZXggPSB0aGlzLl9zZWxlY3RlZFNlYXJjaE1hdGNoID8gdGhpcy5fc2VhcmNo TWF0Y2hlcy5pbmRleE9mKHRoaXMuX3NlbGVjdGVkU2VhcmNoTWF0Y2gpIDogdGhpcy5fc2VhcmNo TWF0Y2hlcy5sZW5ndGg7CkBAIC0zNDUsNyArMzQzLDEzIEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0g Y2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgaGlnaGxp Z2h0TmV4dFNlYXJjaE1hdGNoKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5oYXNQZXJmb3Jt ZWRTZWFyY2ggfHwgaXNFbXB0eU9iamVjdCh0aGlzLl9zZWFyY2hNYXRjaGVzKSkKKyAgICAgICAg aWYgKCF0aGlzLmhhc1BlcmZvcm1lZFNlYXJjaCB8fCB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1 ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSB7CisgICAgICAgICAgICB0aGlzLl9maW5kQmFubmVyLnNl YXJjaFF1ZXJ5ID0gV0kuZmluZFN0cmluZzsKKworICAgICAgICAgICAgdGhpcy5wZXJmb3JtU2Vh cmNoKHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkpOworICAgICAgICB9CisKKyAgICAgICAg aWYgKGlzRW1wdHlPYmplY3QodGhpcy5fc2VhcmNoTWF0Y2hlcykpCiAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgdmFyIGluZGV4ID0gdGhpcy5fc2VsZWN0ZWRTZWFyY2hNYXRjaCA/IHRo aXMuX3NlYXJjaE1hdGNoZXMuaW5kZXhPZih0aGlzLl9zZWxlY3RlZFNlYXJjaE1hdGNoKSArIDEg OiAwOwo=