166935 2017-01-11 10:52:21 -0800 Web Inspector: popovers shouldn't be dismissed when Web Inspector window is dragged 2017-02-16 02:19:45 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi bburg commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1265833 0 bburg 2017-01-11 10:52:21 -0800 This is supremely annoying if you are using a CSS property editor and lose your changes. 1265840 1 webkit-bug-importer 2017-01-11 11:19:03 -0800 <rdar://problem/29972986> 1277378 2 301661 hi 2017-02-15 15:14:54 -0800 Created attachment 301661 Patch 1277382 3 hi 2017-02-15 15:23:49 -0800 (In reply to comment #2) > Created attachment 301661 [details] > Patch I tested this on <https://webkit.org>. For each of the following, find a color inline swatch somewhere in the CSS - Rules sidebar and open it before doing what's listed: - Click one of the dock configuration buttons (detach, dock right, dock bottom) - When undocked, resize the inspector window from any side - When undocked, drag the inspector window from empty space in the toolbar area - When docked right, drag the resizer on the left side of the inspector window - When docked bottom, drag the resizer on the top side of the inspector window - Pressing ⌘⇧D to toggle to the last docked configuration None of the above should dismiss the color picker popover. 1277429 4 301676 hi 2017-02-15 17:07:06 -0800 Created attachment 301676 Patch 1277448 5 301676 joepeck 2017-02-15 18:22:11 -0800 Comment on attachment 301676 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301676&action=review r=me You mentioned: - When docked right, drag the resizer on the left side of the inspector window - When docked bottom, drag the resizer on the top side of the inspector window - Pressing ⌘⇧D to toggle to the last docked configuration I'd actually expect resizes to dismiss or maybe redraw / reposition the popover. Is that still the case? > Source/WebInspectorUI/UserInterface/Views/Popover.js:173 > - if (!this._element.contains(event.target) && !event.target.enclosingNodeOrSelfWithClass(WebInspector.Popover.IgnoreAutoDismissClassName)) > + if (!this._element.contains(event.target) && !event.target.enclosingNodeOrSelfWithClass(WebInspector.Popover.IgnoreAutoDismissClassName) > + && !event[WebInspector.Popover.EventPreventDismissSymbol]) { > this.dismiss(); > + } Style: I think all on one line is fine, or breaking it up on multiple lines: if (this._element.contains(event.target)) break; if (event.target.enclosingNodeOrSelfWithClass(WebInspector.Popover.IgnoreAutoDismissClassName)) break; if (event[WebInspector.Popover.EventPreventDismissSymbol]) break; this.dismiss(); break; 1277520 6 bburg 2017-02-15 22:38:06 -0800 (In reply to comment #5) > Comment on attachment 301676 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=301676&action=review > > r=me > > You mentioned: > > - When docked right, drag the resizer on the left side of the inspector > window > - When docked bottom, drag the resizer on the top side of the inspector > window > - Pressing ⌘⇧D to toggle to the last docked configuration > > I'd actually expect resizes to dismiss or maybe redraw / reposition the > popover. Is that still the case? Note that this bug (per the title) is about dragging. For resizing, I think dismissal is fine. 1277521 7 joepeck 2017-02-15 22:41:08 -0800 We should match system behavior. System behavior doesn't dismiss popovers (though it does allow repositioning them to more optimal positions). That was our existing behavior and it seems that is what Devin says still happens. I just wanted to make sure that was still the case. 1277550 8 301676 hi 2017-02-15 23:56:18 -0800 Comment on attachment 301676 Patch (In reply to comment #7) > We should match system behavior. System behavior doesn't dismiss popovers > (though it does allow repositioning them to more optimal positions). That > was our existing behavior and it seems that is what Devin says still > happens. I just wanted to make sure that was still the case. So it was already the case that resizing when undocked would not dismiss, but instead just reposition the popover. I have extended this to also work when docked (both right and bottom), meaning that whenever the window is moved (when undocked) or resized the popover just recalculates its position. 1277576 9 301676 commit-queue 2017-02-16 02:19:39 -0800 Comment on attachment 301676 Patch Clearing flags on attachment: 301676 Committed r212427: <http://trac.webkit.org/changeset/212427> 1277577 10 commit-queue 2017-02-16 02:19:45 -0800 All reviewed patches have been landed. Closing bug. 301661 2017-02-15 15:14:54 -0800 2017-02-15 17:07:03 -0800 Patch bug-166935-20170215151218.patch text/plain 5360 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDEzNjc1NDNkMzRmMWMwZDBjNzU1MjNjNzg5ZjJi NmE1ODg2Y2QxODEuLjZjYmNlN2EwZTVlYjEwZWJlYzRmOGQ2ZTkwZjgwOTYzZmYxZTM5NjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTAyLTE1ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHBvcG92ZXJzIHNob3VsZG4ndCBiZSBkaXNtaXNzZWQgd2hlbiBXZWIgSW5zcGVjdG9y IHdpbmRvdyBpcyBkcmFnZ2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjY5MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9tb3VzZURvd24p OgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9kb2NrZWRSZXNpemVyTW91c2VEb3duKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5fbW92ZVdpbmRvd01vdXNlRG93bik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuV2luZG93UmVzaXplRXZlbnRTeW1ib2wpOgorICAgICAgICBBcHBsaWVzIHRoZSBXaW5k b3dSZXNpemVFdmVudFN5bWJvbCB3aGVuZXZlciBhIG1vdXNlZG93biBldmVudCBpcyBmaXJlZCBm b3IgYW4gZWxlbWVudCB0aGF0CisgICAgICAgIGNvbnRyb2xzIHRoZSBwb3NpdGlvbmluZyBvciBz aXplIG9mIHRoZSBXZWJJbnNwZWN0b3Igd2luZG93LgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Qb3BvdmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90 eXBlLmRpc21pc3MpOgorICAgICAgICBEbyBub3QgZGlzbWlzcyB0aGUgcG9wb3ZlciBpZiBXaW5k b3dSZXNpemVFdmVudFN5bWJvbCBpcyBhcHBsaWVkIHRvIHRoZSBldmVudC4KKwogMjAxNy0wMi0x NCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBSVEw6IGFkanVzdCBwYWRkaW5nIG9mIGRhc2hib2FyZCBpY29ucwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDE0NmY2MmJjNDAw ODI1MWU0ZDVmMWNiNzZmOTQ0ZGEwYWE0MDBjZGMuLmFkNGNhZTQ5OGZhM2I5NTJkMGNlNWFjYzc0 MTEyNGFjMzJmZjNkYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKQEAgLTIxNyw2ICsyMTcsNyBAQCBXZWJJbnNwZWN0b3IuY29udGVu dExvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigicmVzaXpl IiwgdGhpcy5fd2luZG93UmVzaXplZC5iaW5kKHRoaXMpKTsKICAgICB3aW5kb3cuYWRkRXZlbnRM aXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX3dpbmRvd0tleURvd24uYmluZCh0aGlzKSk7CiAgICAg d2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImtleXVwIiwgdGhpcy5fd2luZG93S2V5VXAuYmluZCh0 aGlzKSk7CisgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21v dXNlRG93bi5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigi bW91c2Vtb3ZlIiwgdGhpcy5fbW91c2VNb3ZlZC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB3aW5k b3cuYWRkRXZlbnRMaXN0ZW5lcigicGFnZWhpZGUiLCB0aGlzLl9wYWdlSGlkZGVuLmJpbmQodGhp cykpOwogICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2Nv bnRleHRNZW51UmVxdWVzdGVkLmJpbmQodGhpcykpOwpAQCAtNDE1LDggKzQxNiw3IEBAIFdlYklu c3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy5tb2RpZmllcktl eXMgPSB7YWx0S2V5OiBmYWxzZSwgbWV0YUtleTogZmFsc2UsIHNoaWZ0S2V5OiBmYWxzZX07CiAK LSAgICB0aGlzLnRvb2xiYXIuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0 aGlzLl90b29sYmFyTW91c2VEb3duLmJpbmQodGhpcykpOwotICAgIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJkb2NrZWQtcmVzaXplciIpLmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRo aXMuX2RvY2tlZFJlc2l6ZXJNb3VzZURvd24uYmluZCh0aGlzKSk7CisgICAgdGhpcy5fZG9ja2Vk UmVzaXplckVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZG9ja2VkLXJlc2l6ZXIi KTsKIAogICAgIHRoaXMuX2RvY2tpbmdBdmFpbGFibGUgPSBmYWxzZTsKIApAQCAtMTQ4Niw2ICsx NDg2LDI2IEBAIFdlYkluc3BlY3Rvci5fd2luZG93S2V5VXAgPSBmdW5jdGlvbihldmVudCkKICAg ICB0aGlzLl91cGRhdGVNb2RpZmllcktleXMoZXZlbnQpOwogfTsKIAorV2ViSW5zcGVjdG9yLl9t b3VzZURvd24gPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICBpZiAodGhpcy50b29sYmFyLmVsZW1l bnQuaXNTZWxmT3JBbmNlc3RvcihldmVudC50YXJnZXQpKSB7CisgICAgICAgIHRoaXMuX3Rvb2xi YXJNb3VzZURvd24oZXZlbnQpOworCisgICAgICAgIGlmICh0aGlzLl91bmRvY2tUb29sYmFyQnV0 dG9uLmVsZW1lbnQuaXNTZWxmT3JBbmNlc3RvcihldmVudC50YXJnZXQpCisgICAgICAgICAgICB8 fCB0aGlzLl9kb2NrUmlnaHRUb29sYmFyQnV0dG9uLmVsZW1lbnQuaXNTZWxmT3JBbmNlc3Rvcihl dmVudC50YXJnZXQpCisgICAgICAgICAgICB8fCB0aGlzLl9kb2NrQm90dG9tVG9vbGJhckJ1dHRv bi5lbGVtZW50LmlzU2VsZk9yQW5jZXN0b3IoZXZlbnQudGFyZ2V0KSkgeworICAgICAgICAgICAg ZXZlbnRbV2ViSW5zcGVjdG9yLldpbmRvd1Jlc2l6ZUV2ZW50U3ltYm9sXSA9IHRydWU7CisgICAg ICAgIH0KKworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKHRoaXMuX2RvY2tlZFJl c2l6ZXJFbGVtZW50LmlzU2VsZk9yQW5jZXN0b3IoZXZlbnQudGFyZ2V0KSkgeworICAgICAgICB0 aGlzLl9kb2NrZWRSZXNpemVyTW91c2VEb3duKGV2ZW50KTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KK307CisKIFdlYkluc3BlY3Rvci5fbW91c2VNb3ZlZCA9IGZ1bmN0aW9uKGV2ZW50KQogewog ICAgIHRoaXMuX3VwZGF0ZU1vZGlmaWVyS2V5cyhldmVudCk7CkBAIC0xNzEzLDYgKzE3MzMsOCBA QCBXZWJJbnNwZWN0b3IuX2RvY2tlZFJlc2l6ZXJNb3VzZURvd24gPSBmdW5jdGlvbihldmVudCkK ICAgICAgICAgIWV2ZW50LnRhcmdldC5jbGFzc0xpc3QuY29udGFpbnMoImZsZXhpYmxlLXNwYWNl IikgJiYgIWV2ZW50LnRhcmdldC5jbGFzc0xpc3QuY29udGFpbnMoIml0ZW0tc2VjdGlvbiIpKQog ICAgICAgICByZXR1cm47CiAKKyAgICBldmVudFtXZWJJbnNwZWN0b3IuV2luZG93UmVzaXplRXZl bnRTeW1ib2xdID0gdHJ1ZTsKKwogICAgIGxldCB3aW5kb3dQcm9wZXJ0eSA9IHRoaXMuX2RvY2tD b25maWd1cmF0aW9uID09PSBXZWJJbnNwZWN0b3IuRG9ja0NvbmZpZ3VyYXRpb24uQm90dG9tID8g ImlubmVySGVpZ2h0IiA6ICJpbm5lcldpZHRoIjsKICAgICBsZXQgZXZlbnRTY3JlZW5Qcm9wZXJ0 eSA9IHRoaXMuX2RvY2tDb25maWd1cmF0aW9uID09PSBXZWJJbnNwZWN0b3IuRG9ja0NvbmZpZ3Vy YXRpb24uQm90dG9tID8gInNjcmVlblkiIDogInNjcmVlblgiOwogICAgIGxldCBldmVudENsaWVu dFByb3BlcnR5ID0gdGhpcy5fZG9ja0NvbmZpZ3VyYXRpb24gPT09IFdlYkluc3BlY3Rvci5Eb2Nr Q29uZmlndXJhdGlvbi5Cb3R0b20gPyAiY2xpZW50WSIgOiAiY2xpZW50WCI7CkBAIC0xNzc2LDYg KzE3OTgsOCBAQCBXZWJJbnNwZWN0b3IuX21vdmVXaW5kb3dNb3VzZURvd24gPSBmdW5jdGlvbihl dmVudCkKICAgICAgICAgIWV2ZW50LnRhcmdldC5jbGFzc0xpc3QuY29udGFpbnMoIml0ZW0tc2Vj dGlvbiIpKQogICAgICAgICByZXR1cm47CiAKKyAgICBldmVudFtXZWJJbnNwZWN0b3IuV2luZG93 UmVzaXplRXZlbnRTeW1ib2xdID0gdHJ1ZTsKKwogICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZv cm0ubmFtZSA9PT0gIm1hYyIpIHsKICAgICAgICAgLy8gTmV3IE1hYyByZWxlYXNlcyBjYW4gc3Rh cnQgYSB3aW5kb3cgZHJhZy4KICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJz aW9uLnJlbGVhc2UgPj0gMTEpIHsKQEAgLTI2MTYsMyArMjY0MCw1IEBAIFdlYkluc3BlY3Rvci5E b2NrQ29uZmlndXJhdGlvbiA9IHsKICAgICBCb3R0b206ICJib3R0b20iLAogICAgIFVuZG9ja2Vk OiAidW5kb2NrZWQiLAogfTsKKworV2ViSW5zcGVjdG9yLldpbmRvd1Jlc2l6ZUV2ZW50U3ltYm9s ID0gU3ltYm9sKCJ3aW5kb3ctcmVzaXplLWV2ZW50Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcwppbmRleCA5NjQ2Mzk5NDUx NzA2ODg3NjBjZWFjY2EzNDViNjMzMGI2ZTgyYzgyLi5iNTYwY2Q3ZmNmM2ExN2JjNzg2YTFkY2Mx OWU0NzUxMDM3YmIwNjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKQEAgLTE0MSw3ICsxNDEsNyBAQCBXZWJJbnNwZWN0 b3IuUG9wb3ZlciA9IGNsYXNzIFBvcG92ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAK ICAgICBkaXNtaXNzKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9kaXNtaXNzaW5nIHx8IHRo aXMuX2VsZW1lbnQucGFyZW50Tm9kZSAhPT0gZG9jdW1lbnQuYm9keSkKKyAgICAgICAgaWYgKHRo aXMuX2Rpc21pc3NpbmcgfHwgdGhpcy5fZWxlbWVudC5wYXJlbnROb2RlICE9PSBkb2N1bWVudC5i b2R5IHx8IHdpbmRvdy5ldmVudFtXZWJJbnNwZWN0b3IuV2luZG93UmVzaXplRXZlbnRTeW1ib2xd KQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRoaXMuX2Rpc21pc3NpbmcgPSB0cnVl Owo= 301676 2017-02-15 17:07:06 -0800 2017-02-16 02:19:39 -0800 Patch bug-166935-20170215170430.patch text/plain 7253 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDEzNjc1NDNkMzRmMWMwZDBjNzU1MjNjNzg5ZjJi NmE1ODg2Y2QxODEuLjczZmE5N2E3NzE2ZTA3MzhmYmFlYzIxYmEyZTI5MWNhZGU4M2ZhNTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTAyLTE1ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHBvcG92ZXJzIHNob3VsZG4ndCBiZSBkaXNtaXNzZWQgd2hlbiBXZWIgSW5zcGVjdG9y IHdpbmRvdyBpcyBkcmFnZ2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjY5MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9tb3VzZURvd24p OiBDcmVhdGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9kb2NrZWRSZXNpemVyTW91c2VEb3du KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5fbW92ZVdpbmRvd01vdXNlRG93bik6CisgICAgICAg IEFwcGxpZXMgUG9wb3Zlci5FdmVudFByZXZlbnREaXNtaXNzU3ltYm9sIHdoZW5ldmVyIGEgbW91 c2Vkb3duIGV2ZW50IGlzIGZpcmVkIGZvciBhbiBlbGVtZW50CisgICAgICAgIHRoYXQgY29udHJv bHMgdGhlIHBvc2l0aW9uaW5nIG9yIHNpemUgb2YgdGhlIFdlYkluc3BlY3RvciB3aW5kb3cuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUG9wb3Zlci5wcm90b3R5cGUuX2hhbmRsZUV2ZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qb3BvdmVyLkV2ZW50UHJldmVudERpc21pc3NTeW1ib2wpOgorICAgICAgICBEbyBu b3QgZGlzbWlzcyB0aGUgcG9wb3ZlciBpZiBQb3BvdmVyLkV2ZW50UHJldmVudERpc21pc3NTeW1i b2wgaXMgYXBwbGllZCB0byB0aGUgZXZlbnQuCisKIDIwMTctMDItMTQgIEJyaWFuIEJ1cmcgIDxi YnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUlRMOiBhZGp1c3QgcGFk ZGluZyBvZiBkYXNoYm9hcmQgaWNvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCAxNDZmNjJiYzQwMDgyNTFlNGQ1ZjFjYjc2Zjk0 NGRhMGFhNDAwY2RjLi43ZDQwYTFhZTE5NWM2ODNhOTA2ZmRhMzU2OThkNGQ4ZmZiMjRmNGZjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpz CkBAIC0yMTcsNiArMjE3LDcgQEAgV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlv bigpCiAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoInJlc2l6ZSIsIHRoaXMuX3dpbmRvd1Jl c2l6ZWQuYmluZCh0aGlzKSk7CiAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24i LCB0aGlzLl93aW5kb3dLZXlEb3duLmJpbmQodGhpcykpOwogICAgIHdpbmRvdy5hZGRFdmVudExp c3RlbmVyKCJrZXl1cCIsIHRoaXMuX3dpbmRvd0tleVVwLmJpbmQodGhpcykpOworICAgIHdpbmRv dy5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9tb3VzZURvd24uYmluZCh0aGlz KSwgdHJ1ZSk7CiAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbW92ZSIsIHRoaXMu X21vdXNlTW92ZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoInBhZ2VoaWRlIiwgdGhpcy5fcGFnZUhpZGRlbi5iaW5kKHRoaXMpKTsKICAgICB3aW5kb3cu YWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9jb250ZXh0TWVudVJlcXVlc3Rl ZC5iaW5kKHRoaXMpKTsKQEAgLTM0NywxMiArMzQ4LDE1IEBAIFdlYkluc3BlY3Rvci5jb250ZW50 TG9hZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2Nsb3NlVG9vbGJhckJ1dHRvbi5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2Vk LCB0aGlzLmNsb3NlLCB0aGlzKTsKIAogICAgIHRoaXMuX3VuZG9ja1Rvb2xiYXJCdXR0b24gPSBu ZXcgV2ViSW5zcGVjdG9yLkJ1dHRvblRvb2xiYXJJdGVtKCJ1bmRvY2siLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkRldGFjaCBpbnRvIHNlcGFyYXRlIHdpbmRvdyIpLCBudWxsLCAiSW1hZ2VzL1Vu ZG9jay5zdmciKTsKKyAgICB0aGlzLl91bmRvY2tUb29sYmFyQnV0dG9uLmVsZW1lbnQuY2xhc3NM aXN0LmFkZChXZWJJbnNwZWN0b3IuUG9wb3Zlci5JZ25vcmVBdXRvRGlzbWlzc0NsYXNzTmFtZSk7 CiAgICAgdGhpcy5fdW5kb2NrVG9vbGJhckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl91bmRvY2ssIHRo aXMpOwogCiAgICAgdGhpcy5fZG9ja1JpZ2h0VG9vbGJhckJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0 b3IuQnV0dG9uVG9vbGJhckl0ZW0oImRvY2stcmlnaHQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkRvY2sgdG8gcmlnaHQgb2Ygd2luZG93IiksIG51bGwsICJJbWFnZXMvRG9ja1JpZ2h0LnN2ZyIp OworICAgIHRoaXMuX2RvY2tSaWdodFRvb2xiYXJCdXR0b24uZWxlbWVudC5jbGFzc0xpc3QuYWRk KFdlYkluc3BlY3Rvci5Qb3BvdmVyLklnbm9yZUF1dG9EaXNtaXNzQ2xhc3NOYW1lKTsKICAgICB0 aGlzLl9kb2NrUmlnaHRUb29sYmFyQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2RvY2tSaWdodCwgdGhp cyk7CiAKICAgICB0aGlzLl9kb2NrQm90dG9tVG9vbGJhckJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0 b3IuQnV0dG9uVG9vbGJhckl0ZW0oImRvY2stYm90dG9tIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJEb2NrIHRvIGJvdHRvbSBvZiB3aW5kb3ciKSwgbnVsbCwgIkltYWdlcy9Eb2NrQm90dG9tLnN2 ZyIpOworICAgIHRoaXMuX2RvY2tCb3R0b21Ub29sYmFyQnV0dG9uLmVsZW1lbnQuY2xhc3NMaXN0 LmFkZChXZWJJbnNwZWN0b3IuUG9wb3Zlci5JZ25vcmVBdXRvRGlzbWlzc0NsYXNzTmFtZSk7CiAg ICAgdGhpcy5fZG9ja0JvdHRvbVRvb2xiYXJCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fZG9ja0JvdHRv bSwgdGhpcyk7CiAKICAgICB0aGlzLl90b2dnbGVQcmV2aW91c0RvY2tDb25maWd1cmF0aW9uS2V5 Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsICJEIiwgdGhpcy5fdG9nZ2xl UHJldmlvdXNEb2NrQ29uZmlndXJhdGlvbi5iaW5kKHRoaXMpKTsKQEAgLTQxNSw4ICs0MTksOSBA QCBXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMubW9k aWZpZXJLZXlzID0ge2FsdEtleTogZmFsc2UsIG1ldGFLZXk6IGZhbHNlLCBzaGlmdEtleTogZmFs c2V9OwogCi0gICAgdGhpcy50b29sYmFyLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vk b3duIiwgdGhpcy5fdG9vbGJhck1vdXNlRG93bi5iaW5kKHRoaXMpKTsKLSAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiZG9ja2VkLXJlc2l6ZXIiKS5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRv d24iLCB0aGlzLl9kb2NrZWRSZXNpemVyTW91c2VEb3duLmJpbmQodGhpcykpOworICAgIGxldCBk b2NrZWRSZXNpemVyRWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJkb2NrZWQtcmVz aXplciIpOworICAgIGRvY2tlZFJlc2l6ZXJFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVj dG9yLlBvcG92ZXIuSWdub3JlQXV0b0Rpc21pc3NDbGFzc05hbWUpOworICAgIGRvY2tlZFJlc2l6 ZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2RvY2tlZFJlc2l6 ZXJNb3VzZURvd24uYmluZCh0aGlzKSk7CiAKICAgICB0aGlzLl9kb2NraW5nQXZhaWxhYmxlID0g ZmFsc2U7CiAKQEAgLTE0ODYsNiArMTQ5MSwxMiBAQCBXZWJJbnNwZWN0b3IuX3dpbmRvd0tleVVw ID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgdGhpcy5fdXBkYXRlTW9kaWZpZXJLZXlzKGV2ZW50KTsK IH07CiAKK1dlYkluc3BlY3Rvci5fbW91c2VEb3duID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAg aWYgKHRoaXMudG9vbGJhci5lbGVtZW50LmlzU2VsZk9yQW5jZXN0b3IoZXZlbnQudGFyZ2V0KSkK KyAgICAgICAgdGhpcy5fdG9vbGJhck1vdXNlRG93bihldmVudCk7Cit9OworCiBXZWJJbnNwZWN0 b3IuX21vdXNlTW92ZWQgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICB0aGlzLl91cGRhdGVNb2Rp ZmllcktleXMoZXZlbnQpOwpAQCAtMTcxMyw2ICsxNzI0LDggQEAgV2ViSW5zcGVjdG9yLl9kb2Nr ZWRSZXNpemVyTW91c2VEb3duID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgICAgICFldmVudC50YXJn ZXQuY2xhc3NMaXN0LmNvbnRhaW5zKCJmbGV4aWJsZS1zcGFjZSIpICYmICFldmVudC50YXJnZXQu Y2xhc3NMaXN0LmNvbnRhaW5zKCJpdGVtLXNlY3Rpb24iKSkKICAgICAgICAgcmV0dXJuOwogCisg ICAgZXZlbnRbV2ViSW5zcGVjdG9yLlBvcG92ZXIuRXZlbnRQcmV2ZW50RGlzbWlzc1N5bWJvbF0g PSB0cnVlOworCiAgICAgbGV0IHdpbmRvd1Byb3BlcnR5ID0gdGhpcy5fZG9ja0NvbmZpZ3VyYXRp b24gPT09IFdlYkluc3BlY3Rvci5Eb2NrQ29uZmlndXJhdGlvbi5Cb3R0b20gPyAiaW5uZXJIZWln aHQiIDogImlubmVyV2lkdGgiOwogICAgIGxldCBldmVudFNjcmVlblByb3BlcnR5ID0gdGhpcy5f ZG9ja0NvbmZpZ3VyYXRpb24gPT09IFdlYkluc3BlY3Rvci5Eb2NrQ29uZmlndXJhdGlvbi5Cb3R0 b20gPyAic2NyZWVuWSIgOiAic2NyZWVuWCI7CiAgICAgbGV0IGV2ZW50Q2xpZW50UHJvcGVydHkg PSB0aGlzLl9kb2NrQ29uZmlndXJhdGlvbiA9PT0gV2ViSW5zcGVjdG9yLkRvY2tDb25maWd1cmF0 aW9uLkJvdHRvbSA/ICJjbGllbnRZIiA6ICJjbGllbnRYIjsKQEAgLTE3NzYsNiArMTc4OSw4IEBA IFdlYkluc3BlY3Rvci5fbW92ZVdpbmRvd01vdXNlRG93biA9IGZ1bmN0aW9uKGV2ZW50KQogICAg ICAgICAhZXZlbnQudGFyZ2V0LmNsYXNzTGlzdC5jb250YWlucygiaXRlbS1zZWN0aW9uIikpCiAg ICAgICAgIHJldHVybjsKIAorICAgIGV2ZW50W1dlYkluc3BlY3Rvci5Qb3BvdmVyLkV2ZW50UHJl dmVudERpc21pc3NTeW1ib2xdID0gdHJ1ZTsKKwogICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZv cm0ubmFtZSA9PT0gIm1hYyIpIHsKICAgICAgICAgLy8gTmV3IE1hYyByZWxlYXNlcyBjYW4gc3Rh cnQgYSB3aW5kb3cgZHJhZy4KICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJz aW9uLnJlbGVhc2UgPj0gMTEpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCmluZGV4IDk2NDYzOTk0NTE3MDY4ODc2MGNlYWNj YTM0NWI2MzMwYjZlODJjODIuLjNlZGVlOGM4NWU1NDhkZTUxNzkwZTFhNTQ0MWM4NmI4YTdmNzk0 YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1BvcG92ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUG9wb3Zlci5qcwpAQCAtMTY3LDggKzE2NywxMCBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlciA9 IGNsYXNzIFBvcG92ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHN3aXRj aCAoZXZlbnQudHlwZSkgewogICAgICAgICBjYXNlICJtb3VzZWRvd24iOgogICAgICAgICBjYXNl ICJzY3JvbGwiOgotICAgICAgICAgICAgaWYgKCF0aGlzLl9lbGVtZW50LmNvbnRhaW5zKGV2ZW50 LnRhcmdldCkgJiYgIWV2ZW50LnRhcmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aENsYXNzKFdl Ykluc3BlY3Rvci5Qb3BvdmVyLklnbm9yZUF1dG9EaXNtaXNzQ2xhc3NOYW1lKSkKKyAgICAgICAg ICAgIGlmICghdGhpcy5fZWxlbWVudC5jb250YWlucyhldmVudC50YXJnZXQpICYmICFldmVudC50 YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcyhXZWJJbnNwZWN0b3IuUG9wb3Zlci5J Z25vcmVBdXRvRGlzbWlzc0NsYXNzTmFtZSkKKyAgICAgICAgICAgICAgICAmJiAhZXZlbnRbV2Vi SW5zcGVjdG9yLlBvcG92ZXIuRXZlbnRQcmV2ZW50RGlzbWlzc1N5bWJvbF0pIHsKICAgICAgICAg ICAgICAgICB0aGlzLmRpc21pc3MoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlICJyZXNpemUiOgogICAgICAgICAgICAgaWYgKHRoaXMuX3Jlc2l6ZUhh bmRsZXIpCkBAIC01OTgsMyArNjAwLDQgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIuQ29udGVudFBh ZGRpbmcgPSA1OwogV2ViSW5zcGVjdG9yLlBvcG92ZXIuQW5jaG9yU2l6ZSA9IG5ldyBXZWJJbnNw ZWN0b3IuU2l6ZSgyMiwgMTEpOwogV2ViSW5zcGVjdG9yLlBvcG92ZXIuU2hhZG93RWRnZUluc2V0 cyA9IG5ldyBXZWJJbnNwZWN0b3IuRWRnZUluc2V0cyhXZWJJbnNwZWN0b3IuUG9wb3Zlci5TaGFk b3dQYWRkaW5nKTsKIFdlYkluc3BlY3Rvci5Qb3BvdmVyLklnbm9yZUF1dG9EaXNtaXNzQ2xhc3NO YW1lID0gInBvcG92ZXItaWdub3JlLWF1dG8tZGlzbWlzcyI7CitXZWJJbnNwZWN0b3IuUG9wb3Zl ci5FdmVudFByZXZlbnREaXNtaXNzU3ltYm9sID0gU3ltYm9sKCJwb3BvdmVyLWV2ZW50LXByZXZl bnQtZGlzbWlzcyIpOwo=