210672 2020-04-17 14:30:23 -0700 Web Inspector: removing a `WI.TreeElement` in a `WI.NavigationSidebar` doesn't check if the `WI.TreeOutline` still matches the current filter 2020-04-20 12:59:40 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1642841 0 hi 2020-04-17 14:30:23 -0700 # STEPS TO REPRODUCE 1. inspect any page with a JavaScript resource 2. go to the Sources Tab 3. filter for that JavaScript resource => the Breakpoints section should say "No Filter Results" 4. set a breakpoint in that JavaScript resource => the Breakpoints section should update to show the new breakpoint 5. delete the breakpoint added in step 4 ## EXPECTED The Breakpoints section should show "No Filter Results". ## ACTUAL The Breakpoints section is empty. 1642842 1 396800 hi 2020-04-17 14:30:55 -0700 Created attachment 396800 Patch 1642908 2 396800 joepeck 2020-04-17 17:15:35 -0700 Comment on attachment 396800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396800&action=review r=me > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:634 > + _handleTreeElementRemoved(event) > + { > + this._checkForEmptyFilterResults(); I wonder how much time is spent in `_checkForEmptyFilterResults` during bulk modifications (adds or removes). That could easily be made more efficient if needed. 1642911 3 396820 hi 2020-04-17 17:52:23 -0700 Created attachment 396820 Patch well one optimization would be to only look inside the `WI.TreeOutline` that actually changed :P 1643524 4 ews-feeder 2020-04-20 11:02:08 -0700 Committed r260375: <https://trac.webkit.org/changeset/260375> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396820. 1643527 5 webkit-bug-importer 2020-04-20 11:03:15 -0700 <rdar://problem/62066377> 1643602 6 396820 bburg 2020-04-20 12:59:40 -0700 Comment on attachment 396820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396820&action=review > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:531 > + _checkForEmptyFilterResults(treeOutline) Naming nit: I would not assume from the name that this updates the UI with the No Results placeholder. Nor can I understand what the parameter is. It replaces the per-outline function, but doesn't mention outline in the name. I'd prefer _updateOutlineForEmptyFilterResultsIfNeeded(), maybe dropping IfNeeded, if needed. :) > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:572 > + // All top level tree elements are hidden, so filtering hid everything. Show a message. Nit on the original line: 'hid' is weird, I would use 'omitted'. 396800 2020-04-17 14:30:55 -0700 2020-04-17 17:52:21 -0700 Patch bug-210672-20200417153054.patch text/plain 2587 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDAyMzE2MGY0ZDE2ZTQ0MDA2MjNiMmQ0ZjgxMWVi Mjc5MTY2Y2QxZDQuLjBkNmUxNzA0OTQxZTJiZGFjODRkMmI0M2M2NmRlYzdhMWFjNjY1ZTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA0LTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBy ZW1vdmluZyBhIGBXSS5UcmVlRWxlbWVudGAgaW4gYSBgV0kuTmF2aWdhdGlvblNpZGViYXJgIGRv ZXNuJ3QgY2hlY2sgaWYgdGhlIGBXSS5UcmVlT3V0bGluZWAgc3RpbGwgbWF0Y2hlcyB0aGUgY3Vy cmVudCBmaWx0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMDY3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAg ICAgICAoV0kuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuY3JlYXRlQ29udGVudFRy ZWVPdXRsaW5lKToKKyAgICAgICAgKFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBl Ll9oYW5kbGVUcmVlRWxlbWVudFJlbW92ZWQpOiBBZGRlZC4KKwogMjAyMC0wNC0xNyAgQWxleGV5 IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFpbC5jb20+CiAKICAgICAgICAgTWVkaWFRdWVyeUxp c3Qgc2hvdWxkIGV4dGVuZCBFdmVudFRhcmdldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFy UGFuZWwuanMKaW5kZXggY2E5MzdjZjhmZDA2NTBhNWZlYmY1NjU1NWEyMzFlMzQ1NTg1NDkwNi4u YmJhYmJlMDViMjBjYjllMDYyMzNkODQ0ZDY2ZGQ1NDg0NDUyNTJlZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQ YW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O YXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC0xNDQsNiArMTQ0LDcgQEAgV0kuTmF2aWdhdGlv blNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5T aWRlYmFyUGFuZWwKICAgICAgICAgICAgIGNvbnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3Rl bmVyKFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnRBZGRlZCwgdGhpcy5fdHJlZUVsZW1lbnRB ZGRlZE9yQ2hhbmdlZCwgdGhpcyk7CiAgICAgICAgICAgICBjb250ZW50VHJlZU91dGxpbmUuYWRk RXZlbnRMaXN0ZW5lcihXSS5UcmVlT3V0bGluZS5FdmVudC5FbGVtZW50RGlkQ2hhbmdlLCB0aGlz Ll90cmVlRWxlbWVudEFkZGVkT3JDaGFuZ2VkLCB0aGlzKTsKICAgICAgICAgICAgIGNvbnRlbnRU cmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnRE aXNjbG9zdXJlRGlkQ2hhbmdlZCwgdGhpcy5fdHJlZUVsZW1lbnREaXNjbG9zdXJlRGlkQ2hhbmdl LCB0aGlzKTsKKyAgICAgICAgICAgIGNvbnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVy KFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnRSZW1vdmVkLCB0aGlzLl9oYW5kbGVUcmVlRWxl bWVudFJlbW92ZWQsIHRoaXMpOwogICAgICAgICB9CiAKICAgICAgICAgY29udGVudFRyZWVPdXRs aW5lW1dJLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwuSWdub3JlQ29va2llUmVzdG9yYXRpb25dID0g aWdub3JlQ29va2llUmVzdG9yYXRpb247CkBAIC02MjgsNiArNjI5LDE0IEBAIFdJLk5hdmlnYXRp b25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV0ku U2lkZWJhclBhbmVsCiAgICAgICAgIHRoaXMuX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zp c2liaWxpdHlEZWJvdW5jZXIuZGVsYXlGb3JUaW1lKDApOwogICAgIH0KIAorICAgIF9oYW5kbGVU cmVlRWxlbWVudFJlbW92ZWQoZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9jaGVja0ZvckVt cHR5RmlsdGVyUmVzdWx0cygpOworCisgICAgICAgIGlmICh0aGlzLnZpc2libGUpCisgICAgICAg ICAgICB0aGlzLl91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5RGVib3VuY2Vy LmRlbGF5Rm9yVGltZSgwKTsKKyAgICB9CisKICAgICBfY2hlY2tGb3JTdGFsZVJlc291cmNlc0lm TmVlZGVkKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fY2hlY2tGb3JTdGFsZVJlc291cmNl c1RpbWVvdXRJZGVudGlmaWVyIHx8ICF0aGlzLl9zaG91bGRBdXRvUHJ1bmVTdGFsZVRvcExldmVs UmVzb3VyY2VUcmVlRWxlbWVudHMpCg== 396820 2020-04-17 17:52:23 -0700 2020-04-20 11:02:09 -0700 Patch bug-210672-20200417185222.patch text/plain 8734 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcxN2NmNWQwYTkzNmUxM2VlYjUwODFiZjBlZDlk NTk4MjQ4N2EwNDUuLjVmOTE4MzI0MjQ0ZWQ0YmYzMDcwYWM1MjE0MmU0ZjBhMGU5NjRkZDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBy ZW1vdmluZyBhIGBXSS5UcmVlRWxlbWVudGAgaW4gYSBgV0kuTmF2aWdhdGlvblNpZGViYXJgIGRv ZXNuJ3QgY2hlY2sgaWYgdGhlIGBXSS5UcmVlT3V0bGluZWAgc3RpbGwgbWF0Y2hlcyB0aGUgY3Vy cmVudCBmaWx0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMDY3MgorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qczoKKyAg ICAgICAgKFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLmNyZWF0ZUNvbnRlbnRU cmVlT3V0bGluZSk6CisgICAgICAgIChXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlw ZS51cGRhdGVGaWx0ZXIpOgorICAgICAgICAoV0kuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90 b3R5cGUuX2NoZWNrRm9yRW1wdHlGaWx0ZXJSZXN1bHRzKToKKyAgICAgICAgKFdJLk5hdmlnYXRp b25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl90cmVlRWxlbWVudEFkZGVkT3JDaGFuZ2VkKToKKyAg ICAgICAgKFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9oYW5kbGVUcmVlRWxl bWVudFJlbW92ZWQpOiBBZGRlZC4KKwogMjAyMC0wNC0xNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNz b0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTihyMjQyMDE4 KTogdXNpbmcgYFJlZ0V4cC5wcm90b3R5cGUudGVzdGAgd2l0aCBhIGdsb2JhbCBgUmVnRXhwYCB3 aWxsIGlnbm9yZSBvbmUgcG90ZW50aWFsIG1hdGNoIGFmdGVyIGVhY2ggc3VjY2Vzc2Z1bCBtYXRj aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggY2E5MzdjZjhmZDA2 NTBhNWZlYmY1NjU1NWEyMzFlMzQ1NTg1NDkwNi4uNjBiOTczMTNmMDgyOGJkMzdjZjhkZGUyNWM2 MzRjZGEwOTI1NzdjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBA IC0xNDQsNiArMTQ0LDcgQEAgV0kuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmln YXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5TaWRlYmFyUGFuZWwKICAgICAgICAgICAgIGNv bnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVs ZW1lbnRBZGRlZCwgdGhpcy5fdHJlZUVsZW1lbnRBZGRlZE9yQ2hhbmdlZCwgdGhpcyk7CiAgICAg ICAgICAgICBjb250ZW50VHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXSS5UcmVlT3V0bGlu ZS5FdmVudC5FbGVtZW50RGlkQ2hhbmdlLCB0aGlzLl90cmVlRWxlbWVudEFkZGVkT3JDaGFuZ2Vk LCB0aGlzKTsKICAgICAgICAgICAgIGNvbnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVy KFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnREaXNjbG9zdXJlRGlkQ2hhbmdlZCwgdGhpcy5f dHJlZUVsZW1lbnREaXNjbG9zdXJlRGlkQ2hhbmdlLCB0aGlzKTsKKyAgICAgICAgICAgIGNvbnRl bnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1l bnRSZW1vdmVkLCB0aGlzLl9oYW5kbGVUcmVlRWxlbWVudFJlbW92ZWQsIHRoaXMpOwogICAgICAg ICB9CiAKICAgICAgICAgY29udGVudFRyZWVPdXRsaW5lW1dJLk5hdmlnYXRpb25TaWRlYmFyUGFu ZWwuSWdub3JlQ29va2llUmVzdG9yYXRpb25dID0gaWdub3JlQ29va2llUmVzdG9yYXRpb247CkBA IC0zMTUsMTYgKzMxNiw2IEBAIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZp Z2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuU2lkZWJhclBhbmVsCiAKICAgICB1cGRhdGVG aWx0ZXIoKQogICAgIHsKLSAgICAgICAgbGV0IHNlbGVjdGVkVHJlZUVsZW1lbnQ7Ci0gICAgICAg IGZvciAobGV0IHRyZWVPdXRsaW5lIG9mIHRoaXMuY29udGVudFRyZWVPdXRsaW5lcykgewotICAg ICAgICAgICAgaWYgKHRyZWVPdXRsaW5lLmhpZGRlbiB8fCB0cmVlT3V0bGluZVtXSS5OYXZpZ2F0 aW9uU2lkZWJhclBhbmVsLlN1cHByZXNzRmlsdGVyaW5nU3ltYm9sXSkKLSAgICAgICAgICAgICAg ICBjb250aW51ZTsKLQotICAgICAgICAgICAgc2VsZWN0ZWRUcmVlRWxlbWVudCA9IHRyZWVPdXRs aW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQ7Ci0gICAgICAgICAgICBpZiAoc2VsZWN0ZWRUcmVlRWxl bWVudCkKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotCiAgICAgICAgIGxldCBm aWx0ZXJzID0gdGhpcy5fZmlsdGVyQmFyLmZpbHRlcnM7CiAgICAgICAgIHRoaXMuX3RleHRGaWx0 ZXJSZWdleCA9IHNpbXBsZUdsb2JTdHJpbmdUb1JlZ0V4cChmaWx0ZXJzLnRleHQsICJpIik7CiAg ICAgICAgIHRoaXMuX2ZpbHRlcnNTZXR0aW5nLnZhbHVlID0gZmlsdGVyczsKQEAgLTM1MCw5ICsz NDEsMTAgQEAgV0kuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRl YmFyUGFuZWwgZXh0ZW5kcyBXSS5TaWRlYmFyUGFuZWwKIAogICAgICAgICAgICAgICAgIGN1cnJl bnRUcmVlRWxlbWVudCA9IGN1cnJlbnRUcmVlRWxlbWVudC50cmF2ZXJzZU5leHRUcmVlRWxlbWVu dChmYWxzZSwgbnVsbCwgZG9udFBvcHVsYXRlKTsKICAgICAgICAgICAgIH0KKworICAgICAgICAg ICAgdGhpcy5fY2hlY2tGb3JFbXB0eUZpbHRlclJlc3VsdHModHJlZU91dGxpbmUpOwogICAgICAg ICB9CiAKLSAgICAgICAgdGhpcy5fY2hlY2tGb3JFbXB0eUZpbHRlclJlc3VsdHMoKTsKICAgICAg ICAgdGhpcy5fdXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93VmlzaWJpbGl0eURlYm91bmNlci5m b3JjZSgpOwogICAgIH0KIApAQCAtNTM2LDU3ICs1MjgsNTAgQEAgV0kuTmF2aWdhdGlvblNpZGVi YXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5TaWRlYmFy UGFuZWwKICAgICAgICAgdGhpcy5fYm90dG9tT3ZlcmZsb3dTaGFkb3dFbGVtZW50LnN0eWxlLm9w YWNpdHkgPSAoMSAtIChib3R0b21Db3ZlcmFnZSAvIGVkZ2VUaHJlc2hvbGQpKS50b0ZpeGVkKDEp OwogICAgIH0KIAotICAgIF9jaGVja0ZvckVtcHR5RmlsdGVyUmVzdWx0cygpCisgICAgX2NoZWNr Rm9yRW1wdHlGaWx0ZXJSZXN1bHRzKHRyZWVPdXRsaW5lKQogICAgIHsKLSAgICAgICAgZnVuY3Rp b24gY2hlY2tUcmVlT3V0bGluZUZvckVtcHR5RmlsdGVyUmVzdWx0cyh0cmVlT3V0bGluZSkKLSAg ICAgICAgewotICAgICAgICAgICAgLy8gTm8gdHJlZSBlbGVtZW50cywgc28gZG9uJ3QgdG91Y2gg dGhlIGVtcHR5IGNvbnRlbnQgcGxhY2Vob2xkZXIuCi0gICAgICAgICAgICBpZiAoIXRyZWVPdXRs aW5lLmNoaWxkcmVuLmxlbmd0aCkKLSAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlm ICh0cmVlT3V0bGluZVtXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLlN1cHByZXNzRmlsdGVyaW5n U3ltYm9sXSkKKyAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgLy8gSXRlcmF0ZSBv dmVyIGFsbCB0aGUgdG9wIGxldmVsIHRyZWUgZWxlbWVudHMuIElmIGFueSBmaWx0ZXJhYmxlIGVs ZW1lbnRzIGFyZSB2aXNpYmxlLCByZXR1cm4gZWFybHkuCi0gICAgICAgICAgICBsZXQgZmlsdGVy YWJsZVRyZWVFbGVtZW50Rm91bmQgPSBmYWxzZTsKLSAgICAgICAgICAgIGxldCB1bmZpbHRlcmVk VHJlZUVsZW1lbnRGb3VuZCA9IGZhbHNlOwotICAgICAgICAgICAgbGV0IGN1cnJlbnRUcmVlRWxl bWVudCA9IHRyZWVPdXRsaW5lLmNoaWxkcmVuWzBdOwotICAgICAgICAgICAgd2hpbGUgKGN1cnJl bnRUcmVlRWxlbWVudCkgewotICAgICAgICAgICAgICAgIGxldCBzdXBwcmVzc0ZpbHRlcmluZ0Zv clRyZWVFbGVtZW50ID0gY3VycmVudFRyZWVFbGVtZW50W1dJLk5hdmlnYXRpb25TaWRlYmFyUGFu ZWwuU3VwcHJlc3NGaWx0ZXJpbmdTeW1ib2xdOwotICAgICAgICAgICAgICAgIGlmICghc3VwcHJl c3NGaWx0ZXJpbmdGb3JUcmVlRWxlbWVudCkgewotICAgICAgICAgICAgICAgICAgICBmaWx0ZXJh YmxlVHJlZUVsZW1lbnRGb3VuZCA9IHRydWU7CisgICAgICAgIC8vIE5vIHRyZWUgZWxlbWVudHMs IHNvIGRvbid0IHRvdWNoIHRoZSBlbXB0eSBjb250ZW50IHBsYWNlaG9sZGVyLgorICAgICAgICBp ZiAoIXRyZWVPdXRsaW5lLmNoaWxkcmVuLmxlbmd0aCkKKyAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICAgICAgICAgICAgICBpZiAoIWN1cnJlbnRUcmVlRWxlbWVudC5oaWRkZW4pIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgIHVuZmlsdGVyZWRUcmVlRWxlbWVudEZvdW5kID0gdHJ1ZTsK LSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICB9Cisg ICAgICAgIC8vIEl0ZXJhdGUgb3ZlciBhbGwgdGhlIHRvcCBsZXZlbCB0cmVlIGVsZW1lbnRzLiBJ ZiBhbnkgZmlsdGVyYWJsZSBlbGVtZW50cyBhcmUgdmlzaWJsZSwgcmV0dXJuIGVhcmx5LgorICAg ICAgICBsZXQgZmlsdGVyYWJsZVRyZWVFbGVtZW50Rm91bmQgPSBmYWxzZTsKKyAgICAgICAgbGV0 IHVuZmlsdGVyZWRUcmVlRWxlbWVudEZvdW5kID0gZmFsc2U7CisgICAgICAgIGxldCBjdXJyZW50 VHJlZUVsZW1lbnQgPSB0cmVlT3V0bGluZS5jaGlsZHJlblswXTsKKyAgICAgICAgd2hpbGUgKGN1 cnJlbnRUcmVlRWxlbWVudCkgeworICAgICAgICAgICAgbGV0IHN1cHByZXNzRmlsdGVyaW5nRm9y VHJlZUVsZW1lbnQgPSBjdXJyZW50VHJlZUVsZW1lbnRbV0kuTmF2aWdhdGlvblNpZGViYXJQYW5l bC5TdXBwcmVzc0ZpbHRlcmluZ1N5bWJvbF07CisgICAgICAgICAgICBpZiAoIXN1cHByZXNzRmls dGVyaW5nRm9yVHJlZUVsZW1lbnQpIHsKKyAgICAgICAgICAgICAgICBmaWx0ZXJhYmxlVHJlZUVs ZW1lbnRGb3VuZCA9IHRydWU7CisKKyAgICAgICAgICAgICAgICBpZiAoIWN1cnJlbnRUcmVlRWxl bWVudC5oaWRkZW4pIHsKKyAgICAgICAgICAgICAgICAgICAgdW5maWx0ZXJlZFRyZWVFbGVtZW50 Rm91bmQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAg ICB9Ci0KLSAgICAgICAgICAgICAgICBjdXJyZW50VHJlZUVsZW1lbnQgPSBjdXJyZW50VHJlZUVs ZW1lbnQubmV4dFNpYmxpbmc7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICh1bmZp bHRlcmVkVHJlZUVsZW1lbnRGb3VuZCB8fCAhZmlsdGVyYWJsZVRyZWVFbGVtZW50Rm91bmQpIHsK LSAgICAgICAgICAgICAgICB0aGlzLmhpZGVFbXB0eUNvbnRlbnRQbGFjZWhvbGRlcih0cmVlT3V0 bGluZSk7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZW1wdHlGaWx0ZXJSZXN1bHRzLmRlbGV0ZSh0 cmVlT3V0bGluZSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotCi0g ICAgICAgICAgICBsZXQgbWVzc2FnZSA9IFdJLmNyZWF0ZU1lc3NhZ2VUZXh0VmlldyhXSS5VSVN0 cmluZygiTm8gRmlsdGVyIFJlc3VsdHMiKSk7Ci0KLSAgICAgICAgICAgIGxldCBidXR0b25FbGVt ZW50ID0gbWVzc2FnZS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24i KSk7Ci0gICAgICAgICAgICBidXR0b25FbGVtZW50LnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmco IkNsZWFyIEZpbHRlcnMiKTsKLSAgICAgICAgICAgIGJ1dHRvbkVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiY2xpY2siLCAoKSA9PiB7Ci0gICAgICAgICAgICAgICAgdGhpcy5yZXNldEZpbHRlcigp OwotICAgICAgICAgICAgfSk7Ci0KLSAgICAgICAgICAgIC8vIEFsbCB0b3AgbGV2ZWwgdHJlZSBl bGVtZW50cyBhcmUgaGlkZGVuLCBzbyBmaWx0ZXJpbmcgaGlkIGV2ZXJ5dGhpbmcuIFNob3cgYSBt ZXNzYWdlLgotICAgICAgICAgICAgdGhpcy5zaG93RW1wdHlDb250ZW50UGxhY2Vob2xkZXIobWVz c2FnZSwgdHJlZU91dGxpbmUpOwotICAgICAgICAgICAgdGhpcy5fZW1wdHlGaWx0ZXJSZXN1bHRz LmFkZCh0cmVlT3V0bGluZSk7CisgICAgICAgICAgICBjdXJyZW50VHJlZUVsZW1lbnQgPSBjdXJy ZW50VHJlZUVsZW1lbnQubmV4dFNpYmxpbmc7CiAgICAgICAgIH0KIAotICAgICAgICBmb3IgKGxl dCB0cmVlT3V0bGluZSBvZiB0aGlzLmNvbnRlbnRUcmVlT3V0bGluZXMpIHsKLSAgICAgICAgICAg IGlmICh0cmVlT3V0bGluZVtXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLlN1cHByZXNzRmlsdGVy aW5nU3ltYm9sXSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgY2hl Y2tUcmVlT3V0bGluZUZvckVtcHR5RmlsdGVyUmVzdWx0cy5jYWxsKHRoaXMsIHRyZWVPdXRsaW5l KTsKKyAgICAgICAgaWYgKHVuZmlsdGVyZWRUcmVlRWxlbWVudEZvdW5kIHx8ICFmaWx0ZXJhYmxl VHJlZUVsZW1lbnRGb3VuZCkgeworICAgICAgICAgICAgdGhpcy5oaWRlRW1wdHlDb250ZW50UGxh Y2Vob2xkZXIodHJlZU91dGxpbmUpOworICAgICAgICAgICAgdGhpcy5fZW1wdHlGaWx0ZXJSZXN1 bHRzLmRlbGV0ZSh0cmVlT3V0bGluZSk7CisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0K KworICAgICAgICBsZXQgbWVzc2FnZSA9IFdJLmNyZWF0ZU1lc3NhZ2VUZXh0VmlldyhXSS5VSVN0 cmluZygiTm8gRmlsdGVyIFJlc3VsdHMiKSk7CisKKyAgICAgICAgbGV0IGJ1dHRvbkVsZW1lbnQg PSBtZXNzYWdlLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpKTsK KyAgICAgICAgYnV0dG9uRWxlbWVudC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJDbGVhciBG aWx0ZXJzIik7CisgICAgICAgIGJ1dHRvbkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2si LCAoKSA9PiB7CisgICAgICAgICAgICB0aGlzLnJlc2V0RmlsdGVyKCk7CisgICAgICAgIH0pOwor CisgICAgICAgIC8vIEFsbCB0b3AgbGV2ZWwgdHJlZSBlbGVtZW50cyBhcmUgaGlkZGVuLCBzbyBm aWx0ZXJpbmcgaGlkIGV2ZXJ5dGhpbmcuIFNob3cgYSBtZXNzYWdlLgorICAgICAgICB0aGlzLnNo b3dFbXB0eUNvbnRlbnRQbGFjZWhvbGRlcihtZXNzYWdlLCB0cmVlT3V0bGluZSk7CisgICAgICAg IHRoaXMuX2VtcHR5RmlsdGVyUmVzdWx0cy5hZGQodHJlZU91dGxpbmUpOwogICAgIH0KIAogICAg IF9maWx0ZXJEaWRDaGFuZ2UoKQpAQCAtNjE0LDcgKzU5OSw3IEBAIFdJLk5hdmlnYXRpb25TaWRl YmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuU2lkZWJh clBhbmVsCiAgICAgICAgICAgICBjdXJyZW50VHJlZUVsZW1lbnQgPSBjdXJyZW50VHJlZUVsZW1l bnQudHJhdmVyc2VOZXh0VHJlZUVsZW1lbnQoZmFsc2UsIHRyZWVFbGVtZW50LCBkb250UG9wdWxh dGUpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fY2hlY2tGb3JFbXB0eUZpbHRlclJlc3Vs dHMoKTsKKyAgICAgICAgdGhpcy5fY2hlY2tGb3JFbXB0eUZpbHRlclJlc3VsdHMoZXZlbnQudGFy Z2V0KTsKIAogICAgICAgICBpZiAodGhpcy52aXNpYmxlKQogICAgICAgICAgICAgdGhpcy5fdXBk YXRlQ29udGVudE92ZXJmbG93U2hhZG93VmlzaWJpbGl0eURlYm91bmNlci5kZWxheUZvclRpbWUo MCk7CkBAIC02MjgsNiArNjEzLDE0IEBAIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFz cyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuU2lkZWJhclBhbmVsCiAgICAgICAg IHRoaXMuX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zpc2liaWxpdHlEZWJvdW5jZXIuZGVs YXlGb3JUaW1lKDApOwogICAgIH0KIAorICAgIF9oYW5kbGVUcmVlRWxlbWVudFJlbW92ZWQoZXZl bnQpCisgICAgeworICAgICAgICB0aGlzLl9jaGVja0ZvckVtcHR5RmlsdGVyUmVzdWx0cyhldmVu dC50YXJnZXQpOworCisgICAgICAgIGlmICh0aGlzLnZpc2libGUpCisgICAgICAgICAgICB0aGlz Ll91cGRhdGVDb250ZW50T3ZlcmZsb3dTaGFkb3dWaXNpYmlsaXR5RGVib3VuY2VyLmRlbGF5Rm9y VGltZSgwKTsKKyAgICB9CisKICAgICBfY2hlY2tGb3JTdGFsZVJlc291cmNlc0lmTmVlZGVkKCkK ICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fY2hlY2tGb3JTdGFsZVJlc291cmNlc1RpbWVvdXRJ ZGVudGlmaWVyIHx8ICF0aGlzLl9zaG91bGRBdXRvUHJ1bmVTdGFsZVRvcExldmVsUmVzb3VyY2VU cmVlRWxlbWVudHMpCg==