209760 2020-03-30 13:06:48 -0700 Web Inspector: the Dock Side navigation item is automatically focused when Web Inspector is opened detached, preventing any global spacebar shortcuts from working 2020-03-30 20:33:16 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi nvasilyev hi inspector-bugzilla-changes nvasilyev webkit-bug-importer oldest_to_newest 1635663 0 hi 2020-03-30 13:06:48 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. detach/undock Web Inspector 3. go to the Timelines Tab 4. close Web Inspector 5. open Web Inspector 6. press space => expect a timeline recording to start, but instead the Dock Side button is "clicked" causing Web Inspector to dock to the side 1635745 1 nvasilyev 2020-03-30 14:45:03 -0700 There's something specific about undocked mode that makes it focus on the first focusable DOM element. I don't quite understand it yet. On Safari shipped with macOS Catalina it focuses on the global search field. It was the first focusable DOM element at the time. 1635777 2 nvasilyev 2020-03-30 15:20:44 -0700 I attempted to duct tape the issue. I appended the following to WI.updateDockedState: if (side === WI.DockConfiguration.Undocked) { console.info(document.activeElement); // activeElement is the dock to right button document.activeElement?.blur(); console.info(document.activeElement); // activeElement is document.body } To my surprise, this didn't even work! if (side === WI.DockConfiguration.Undocked) { console.info(document.activeElement); document.activeElement?.blur(); console.info(document.activeElement); setTimeout(() => { console.log(document.activeElement); // activeElement is the dock to right button, again! }, 500) } 1635829 3 nvasilyev 2020-03-30 16:38:35 -0700 If this's a regression than it broke over a year ago. 1635854 4 394986 nvasilyev 2020-03-30 16:52:55 -0700 Created attachment 394986 Patch This is the least ugliest fix I could come up with. --- I've tried restoring focus in WI.TabBar.prototype.didLayoutSubtree. That fixed the problem described in the bug, but it didn't fix this: 1. Inspect any page 2. Dock Web Inspector 3. Go to the Timelines Tab 4. Undock Web Inspector (by pressing Command-Shift-D, for example) My current patch does fix it. --- I tried restoring focus on requestAnimationFrame. It didn't work. I've tried restoring focus after a timeout. It introduced flickering. Also, it was even uglier than my current patch. 1635874 5 394986 hi 2020-03-30 17:34:53 -0700 Comment on attachment 394986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394986&action=review r=me, with some comments It may also be worth noting that on the first open (which is where I noticed this), in tabs where we restore the focus from the previous session if able (e.g. the previously selected node in the Elements Tab, the previously selected resource in the Source Tab, etc.), the focus shifted away from the first focusable item very quickly, although you could usually see the flash of a focus ring. Furthermore, in every tab except the Timelines Tab and the Audit Tab, we default to focusing the console prompt (r252213), so this bug only appeared to fully manifest (focus stays with the first visible element) on those tabs. With that having been said, however, this bug did always show when switching docking configurations after Web Inspector is already open. Amazing that this hasn't been noticed till now (o.0) > Source/WebInspectorUI/UserInterface/Base/Main.js:905 > + if (side === WI.DockConfiguration.Undocked) { Do we know if this is macOS-only behavior? We should probably only do this if `WI.Platform.name === "mac"`. > Source/WebInspectorUI/UserInterface/Base/Main.js:906 > + // When undocking, the second focusable element steals focus. Undo this. This doesn't sound right. I would imagine that it's the first visible focusable element. > Source/WebInspectorUI/UserInterface/Base/Main.js:907 > + // <http://webkit.org/b/209760> Including a link to this bug is unnecessary, as you can just blame this line to get that info. Please remove. > Source/WebInspectorUI/UserInterface/Base/Main.js:909 > + if (WI.tabBar.element.contains(event.target)) { Why are we checking to see if it's in the `WI.tabBar`? If we know it steals focus, we shouldn't need to check where it moves the focus. ``` document.body.addEventListener("focusin", (event) => { if (WI.previousFocusElement) WI.previousFocusElement.focus(); else event.target.blur(); }); ``` Also, this code implies that the focus change happens _after_ `WI.updateDockedState` is called. Is that guaranteed, or could we somehow "miss" the focus event because we added the event listener too late? 1635894 6 394986 nvasilyev 2020-03-30 18:17:16 -0700 Comment on attachment 394986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394986&action=review >> Source/WebInspectorUI/UserInterface/Base/Main.js:905 >> + if (side === WI.DockConfiguration.Undocked) { > > Do we know if this is macOS-only behavior? We should probably only do this if `WI.Platform.name === "mac"`. I don't. Frankly, I don't test on WebKitGTK. >> Source/WebInspectorUI/UserInterface/Base/Main.js:906 >> + // When undocking, the second focusable element steals focus. Undo this. > > This doesn't sound right. I would imagine that it's the first visible focusable element. Whoops, you're right. The keyword is *visible*. (When I stare into something for 3 hours straight I make mistakes like this.) >> Source/WebInspectorUI/UserInterface/Base/Main.js:909 >> + if (WI.tabBar.element.contains(event.target)) { > > Why are we checking to see if it's in the `WI.tabBar`? If we know it steals focus, we shouldn't need to check where it moves the focus. > > ``` > document.body.addEventListener("focusin", (event) => { > if (WI.previousFocusElement) > WI.previousFocusElement.focus(); > else > event.target.blur(); > }); > ``` > > Also, this code implies that the focus change happens _after_ `WI.updateDockedState` is called. Is that guaranteed, or could we somehow "miss" the focus event because we added the event listener too late? If some change in WebKit happens to fix this bug, this code would oddly move the focus to the previously focused element. The idea was mitigate that by checking if it's in the `WI.tabBar`. I observed focus changes _only_ after `WI.updateDockedState` is called. Furthermore, I couldn't pinpoint the exact code that triggered the focus change, so I couldn't add a callback. 1635898 7 nvasilyev 2020-03-30 18:31:52 -0700 (In reply to Devin Rousso from comment #5) > > Amazing that this hasn't been noticed till now (o.0) When it was focusing on the search field it didn't stand out as it does now. 1635899 8 394999 nvasilyev 2020-03-30 18:33:14 -0700 Created attachment 394999 Patch 1635900 9 394999 nvasilyev 2020-03-30 18:34:06 -0700 Comment on attachment 394999 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394999&action=review > Source/WebInspectorUI/UserInterface/Base/Main.js:909 > + let firstFocusableElement = document.querySelector("[tabIndex='0']:not(.hidden)"); > + if (firstFocusableElement === event.target) { How about this? I think this is more future-proof. 1635902 10 395000 nvasilyev 2020-03-30 18:38:54 -0700 Created attachment 395000 Patch Fixed typo. 1635909 11 394999 hi 2020-03-30 18:54:57 -0700 Comment on attachment 394999 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394999&action=review > Source/WebInspectorUI/UserInterface/Base/Main.js:908 > + let firstFocusableElement = document.querySelector("[tabIndex='0']:not(.hidden)"); I realize that CSS selectors aren't case sensitive, but we should try to keep CSS/DOM things alike. As such, this should be `tabindex` (lowercase). >> Source/WebInspectorUI/UserInterface/Base/Main.js:909 >> + if (firstFocusableElement === event.target) { > > How about this? I think this is more future-proof. Yeah, that sounds reasonable. This would break if we ever added a non-0 `tabindex`, however. What if instead of listening for `"focusin"`, we set a global flag when updating the docking configuration that calls `preventDefault()` on the next `"focus"` event? From what you've seen, it will come after `WI.updateDockedState` is called, so maybe we can just do that instead of having to worry about whether or not the newly-incorretly-focused node is the node we expect? Ideally, it'd be great to understand why this is happening at all, and perhaps figure out a fix for it in the backed (e.g. set some preference on the webview/window used by Web Inspector). 1635920 12 395007 nvasilyev 2020-03-30 19:45:56 -0700 Created attachment 395007 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394999&action=review >>> Source/WebInspectorUI/UserInterface/Base/Main.js:909 >>> + if (firstFocusableElement === event.target) { >> >> How about this? I think this is more future-proof. > > Yeah, that sounds reasonable. > > This would break if we ever added a non-0 `tabindex`, however. What if instead of listening for `"focusin"`, we set a global flag when updating the docking configuration that calls `preventDefault()` on the next `"focus"` event? From what you've seen, it will come after `WI.updateDockedState` is called, so maybe we can just do that instead of having to worry about whether or not the newly-incorretly-focused node is the node we expect? > > Ideally, it'd be great to understand why this is happening at all, and perhaps figure out a fix for it in the backed (e.g. set some preference on the webview/window used by Web Inspector). Focus event isn't preventable. 1635930 13 ews-feeder 2020-03-30 20:32:12 -0700 Committed r259277: <https://trac.webkit.org/changeset/259277> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395007. 1635931 14 webkit-bug-importer 2020-03-30 20:33:16 -0700 <rdar://problem/61087781> 394986 2020-03-30 16:52:55 -0700 2020-03-30 18:33:14 -0700 Patch patch.txt text/plain 1922 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiMTkxYzRlODhlLi5hMmIyNjIzZTgyOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMzAgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogdGhlIERvY2sgU2lkZSBuYXZpZ2F0aW9uIGl0ZW0gaXMgYXV0b21hdGljYWxseSBmb2N1c2Vk IHdoZW4gV2ViIEluc3BlY3RvciBpcyBvcGVuZWQgZGV0YWNoZWQsIHByZXZlbnRpbmcgYW55IGds b2JhbCBzcGFjZWJhciBzaG9ydGN1dHMgZnJvbSB3b3JraW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk3NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHVuZG9ja2luZywgV2ViIEluc3BlY3Rv ciBmb2N1c2VzIG9uIHRoZSAybmQgZm9jdXNhYmxlIGVsZW1lbnQuIEkgZG9uJ3Qga25vdyB3aHku CisgICAgICAgIFRoaXMgcGF0Y2ggcmVzdG9yZXMgdGhlIGZvY3VzIHRvIHRoZSBwcmV2aW91c2x5 IGZvY3VzZWQgZWxlbWVudC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpz OgorCiAyMDIwLTAzLTI2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBhZGQga2V5Ym9hcmQgc2hvcnRjdXQgdG8gdG9vbHRpcCBvZiBw aW5uZWQgdGFicwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCmluZGV4IGY4NmUwM2IyMzM1Li4xMmZmZTdjZmE4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtOTAxLDYgKzkw MSwxOSBAQCBXSS51cGRhdGVEb2NrZWRTdGF0ZSA9IGZ1bmN0aW9uKHNpZGUpCiAKICAgICBpZiAo IVdJLmRvY2tlZENvbmZpZ3VyYXRpb25TdXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIoKSAmJiAh V0kuZG9lc0N1cnJlbnRUYWJTdXBwb3J0U3BsaXRDb250ZW50QnJvd3NlcigpKQogICAgICAgICBX SS5oaWRlU3BsaXRDb25zb2xlKCk7CisKKyAgICBpZiAoc2lkZSA9PT0gV0kuRG9ja0NvbmZpZ3Vy YXRpb24uVW5kb2NrZWQpIHsKKyAgICAgICAgLy8gV2hlbiB1bmRvY2tpbmcsIHRoZSBzZWNvbmQg Zm9jdXNhYmxlIGVsZW1lbnQgc3RlYWxzIGZvY3VzLiBVbmRvIHRoaXMuCisgICAgICAgIC8vIDxo dHRwOi8vd2Via2l0Lm9yZy9iLzIwOTc2MD4KKyAgICAgICAgZG9jdW1lbnQuYm9keS5hZGRFdmVu dExpc3RlbmVyKCJmb2N1c2luIiwgZnVuY3Rpb24oZXZlbnQpIHsKKyAgICAgICAgICAgIGlmIChX SS50YWJCYXIuZWxlbWVudC5jb250YWlucyhldmVudC50YXJnZXQpKSB7CisgICAgICAgICAgICAg ICAgaWYgKFdJLnByZXZpb3VzRm9jdXNFbGVtZW50KQorICAgICAgICAgICAgICAgICAgICBXSS5w cmV2aW91c0ZvY3VzRWxlbWVudC5mb2N1cygpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICAgICAgZXZlbnQudGFyZ2V0LmJsdXIoKTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfSwge29uY2U6IHRydWUsIGNhcHR1cmU6IHRydWV9KTsKKyAgICB9CiB9OwogCiBXSS5yZXNp emVEb2NrZWRGcmFtZU1vdXNlRG93biA9IGZ1bmN0aW9uKGV2ZW50KQo= 394999 2020-03-30 18:33:14 -0700 2020-03-30 18:38:54 -0700 Patch patch.txt text/plain 2018 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiMTkxYzRlODhlLi5lNTU5OTYzOWFhMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMzAgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogdGhlIERvY2sgU2lkZSBuYXZpZ2F0aW9uIGl0ZW0gaXMgYXV0b21hdGljYWxseSBmb2N1c2Vk IHdoZW4gV2ViIEluc3BlY3RvciBpcyBvcGVuZWQgZGV0YWNoZWQsIHByZXZlbnRpbmcgYW55IGds b2JhbCBzcGFjZWJhciBzaG9ydGN1dHMgZnJvbSB3b3JraW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk3NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgV2hlbiB1bmRvY2tpbmcsIFdlYiBJbnNwZWN0b3Ig Zm9jdXNlcyBvbiB0aGUgMW5kIHZpc2libGUgZm9jdXNhYmxlIGVsZW1lbnQuIEkgZG9uJ3Qga25v dyB3aHkuCisgICAgICAgIFRoaXMgcGF0Y2ggcmVzdG9yZXMgdGhlIGZvY3VzIHRvIHRoZSBwcmV2 aW91c2x5IGZvY3VzZWQgZWxlbWVudC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9N YWluLmpzOgorCiAyMDIwLTAzLTI2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQga2V5Ym9hcmQgc2hvcnRjdXQgdG8gdG9vbHRp cCBvZiBwaW5uZWQgdGFicwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzCmluZGV4IGY4NmUwM2IyMzM1Li5mNzFhNjQ0ZGIyZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtOTAx LDYgKzkwMSwxOSBAQCBXSS51cGRhdGVEb2NrZWRTdGF0ZSA9IGZ1bmN0aW9uKHNpZGUpCiAKICAg ICBpZiAoIVdJLmRvY2tlZENvbmZpZ3VyYXRpb25TdXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIo KSAmJiAhV0kuZG9lc0N1cnJlbnRUYWJTdXBwb3J0U3BsaXRDb250ZW50QnJvd3NlcigpKQogICAg ICAgICBXSS5oaWRlU3BsaXRDb25zb2xlKCk7CisKKyAgICBpZiAoc2lkZSA9PT0gV0kuRG9ja0Nv bmZpZ3VyYXRpb24uVW5kb2NrZWQgJiYgV0kuUGxhdGZvcm0ubmFtZSA9PT0gIm1hYyIpIHsKKyAg ICAgICAgLy8gV2hlbiB1bmRvY2tpbmcsIHRoZSBmaXJzdCB2aXNpYmxlIGZvY3VzYWJsZSBlbGVt ZW50IHN0ZWFscyBmb2N1cy4gVW5kbyB0aGlzLgorICAgICAgICBkb2N1bWVudC5ib2R5LmFkZEV2 ZW50TGlzdGVuZXIoImZvY3VzaW4iLCBmdW5jdGlvbihldmVudCkgeworICAgICAgICAgICAgbGV0 IGZpcnN0Rm9jdXNhYmxlRWxlbWVudCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIlt0YWJJbmRl eD0nMCddOm5vdCguaGlkZGVuKSIpOworICAgICAgICAgICAgaWYgKGZpcnN0Rm9jdXNhYmxlRWxl bWVudCA9PT0gZXZlbnQudGFyZ2V0KSB7CisgICAgICAgICAgICAgICAgaWYgKFdJLnByZXZpb3Vz Rm9jdXNFbGVtZW50KQorICAgICAgICAgICAgICAgICAgICBXSS5wcmV2aW91c0ZvY3VzRWxlbWVu dC5mb2N1cygpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgZXZl bnQudGFyZ2V0LmJsdXIoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSwge29uY2U6IHRydWUs IGNhcHR1cmU6IHRydWV9KTsKKyAgICB9CiB9OwogCiBXSS5yZXNpemVEb2NrZWRGcmFtZU1vdXNl RG93biA9IGZ1bmN0aW9uKGV2ZW50KQo= 395000 2020-03-30 18:38:54 -0700 2020-03-30 19:45:56 -0700 Patch patch.txt text/plain 2020 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiMTkxYzRlODhlLi5jN2IwMzNmMGY4YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMzAgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogdGhlIERvY2sgU2lkZSBuYXZpZ2F0aW9uIGl0ZW0gaXMgYXV0b21hdGljYWxseSBmb2N1c2Vk IHdoZW4gV2ViIEluc3BlY3RvciBpcyBvcGVuZWQgZGV0YWNoZWQsIHByZXZlbnRpbmcgYW55IGds b2JhbCBzcGFjZWJhciBzaG9ydGN1dHMgZnJvbSB3b3JraW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk3NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgV2hlbiB1bmRvY2tpbmcsIFdlYiBJbnNwZWN0b3Ig Zm9jdXNlcyBvbiB0aGUgZmlyc3QgdmlzaWJsZSBmb2N1c2FibGUgZWxlbWVudC4gSSBkb24ndCBr bm93IHdoeS4KKyAgICAgICAgVGhpcyBwYXRjaCByZXN0b3JlcyB0aGUgZm9jdXMgdG8gdGhlIHBy ZXZpb3VzbHkgZm9jdXNlZCBlbGVtZW50LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNl L01haW4uanM6CisKIDIwMjAtMDMtMjYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBrZXlib2FyZCBzaG9ydGN1dCB0byB0b29s dGlwIG9mIHBpbm5lZCB0YWJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKaW5kZXggZjg2ZTAzYjIzMzUuLmY3MWE2NDRkYjJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC05 MDEsNiArOTAxLDE5IEBAIFdJLnVwZGF0ZURvY2tlZFN0YXRlID0gZnVuY3Rpb24oc2lkZSkKIAog ICAgIGlmICghV0kuZG9ja2VkQ29uZmlndXJhdGlvblN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3Nl cigpICYmICFXSS5kb2VzQ3VycmVudFRhYlN1cHBvcnRTcGxpdENvbnRlbnRCcm93c2VyKCkpCiAg ICAgICAgIFdJLmhpZGVTcGxpdENvbnNvbGUoKTsKKworICAgIGlmIChzaWRlID09PSBXSS5Eb2Nr Q29uZmlndXJhdGlvbi5VbmRvY2tlZCAmJiBXSS5QbGF0Zm9ybS5uYW1lID09PSAibWFjIikgewor ICAgICAgICAvLyBXaGVuIHVuZG9ja2luZywgdGhlIGZpcnN0IHZpc2libGUgZm9jdXNhYmxlIGVs ZW1lbnQgc3RlYWxzIGZvY3VzLiBVbmRvIHRoaXMuCisgICAgICAgIGRvY3VtZW50LmJvZHkuYWRk RXZlbnRMaXN0ZW5lcigiZm9jdXNpbiIsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgICAgICAgICBs ZXQgZmlyc3RGb2N1c2FibGVFbGVtZW50ID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiW3RhYklu ZGV4PScwJ106bm90KC5oaWRkZW4pIik7CisgICAgICAgICAgICBpZiAoZmlyc3RGb2N1c2FibGVF bGVtZW50ID09PSBldmVudC50YXJnZXQpIHsKKyAgICAgICAgICAgICAgICBpZiAoV0kucHJldmlv dXNGb2N1c0VsZW1lbnQpCisgICAgICAgICAgICAgICAgICAgIFdJLnByZXZpb3VzRm9jdXNFbGVt ZW50LmZvY3VzKCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBl dmVudC50YXJnZXQuYmx1cigpOworICAgICAgICAgICAgfQorICAgICAgICB9LCB7b25jZTogdHJ1 ZSwgY2FwdHVyZTogdHJ1ZX0pOworICAgIH0KIH07CiAKIFdJLnJlc2l6ZURvY2tlZEZyYW1lTW91 c2VEb3duID0gZnVuY3Rpb24oZXZlbnQpCg== 395007 2020-03-30 19:45:56 -0700 2020-03-30 20:32:12 -0700 Patch patch.txt text/plain 2020 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiMTkxYzRlODhlLi5jN2IwMzNmMGY4YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMzAgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogdGhlIERvY2sgU2lkZSBuYXZpZ2F0aW9uIGl0ZW0gaXMgYXV0b21hdGljYWxseSBmb2N1c2Vk IHdoZW4gV2ViIEluc3BlY3RvciBpcyBvcGVuZWQgZGV0YWNoZWQsIHByZXZlbnRpbmcgYW55IGds b2JhbCBzcGFjZWJhciBzaG9ydGN1dHMgZnJvbSB3b3JraW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk3NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgV2hlbiB1bmRvY2tpbmcsIFdlYiBJbnNwZWN0b3Ig Zm9jdXNlcyBvbiB0aGUgZmlyc3QgdmlzaWJsZSBmb2N1c2FibGUgZWxlbWVudC4gSSBkb24ndCBr bm93IHdoeS4KKyAgICAgICAgVGhpcyBwYXRjaCByZXN0b3JlcyB0aGUgZm9jdXMgdG8gdGhlIHBy ZXZpb3VzbHkgZm9jdXNlZCBlbGVtZW50LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNl L01haW4uanM6CisKIDIwMjAtMDMtMjYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBrZXlib2FyZCBzaG9ydGN1dCB0byB0b29s dGlwIG9mIHBpbm5lZCB0YWJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKaW5kZXggZjg2ZTAzYjIzMzUuLjU3YmM0ODJmMmFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC05 MDEsNiArOTAxLDE5IEBAIFdJLnVwZGF0ZURvY2tlZFN0YXRlID0gZnVuY3Rpb24oc2lkZSkKIAog ICAgIGlmICghV0kuZG9ja2VkQ29uZmlndXJhdGlvblN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3Nl cigpICYmICFXSS5kb2VzQ3VycmVudFRhYlN1cHBvcnRTcGxpdENvbnRlbnRCcm93c2VyKCkpCiAg ICAgICAgIFdJLmhpZGVTcGxpdENvbnNvbGUoKTsKKworICAgIGlmIChzaWRlID09PSBXSS5Eb2Nr Q29uZmlndXJhdGlvbi5VbmRvY2tlZCAmJiBXSS5QbGF0Zm9ybS5uYW1lID09PSAibWFjIikgewor ICAgICAgICAvLyBXaGVuIHVuZG9ja2luZywgdGhlIGZpcnN0IHZpc2libGUgZm9jdXNhYmxlIGVs ZW1lbnQgc3RlYWxzIGZvY3VzLiBVbmRvIHRoaXMuCisgICAgICAgIGRvY3VtZW50LmJvZHkuYWRk RXZlbnRMaXN0ZW5lcigiZm9jdXNpbiIsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgICAgICAgICBs ZXQgZmlyc3RGb2N1c2FibGVFbGVtZW50ID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiW3RhYmlu ZGV4PScwJ106bm90KC5oaWRkZW4pIik7CisgICAgICAgICAgICBpZiAoZmlyc3RGb2N1c2FibGVF bGVtZW50ID09PSBldmVudC50YXJnZXQpIHsKKyAgICAgICAgICAgICAgICBpZiAoV0kucHJldmlv dXNGb2N1c0VsZW1lbnQpCisgICAgICAgICAgICAgICAgICAgIFdJLnByZXZpb3VzRm9jdXNFbGVt ZW50LmZvY3VzKCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBl dmVudC50YXJnZXQuYmx1cigpOworICAgICAgICAgICAgfQorICAgICAgICB9LCB7b25jZTogdHJ1 ZSwgY2FwdHVyZTogdHJ1ZX0pOworICAgIH0KIH07CiAKIFdJLnJlc2l6ZURvY2tlZEZyYW1lTW91 c2VEb3duID0gZnVuY3Rpb24oZXZlbnQpCg==