196453 2019-04-01 12:23:02 -0700 Web Inspector: DOMDebugger: disabling a breakpoint for a specific event listener removes it from the UI 2019-04-01 16:38:52 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1522998 0 hi 2019-04-01 12:23:02 -0700 If I set a breakpoint on a specific node's event listener for a specific event, disabling that breakpoint shouldn't delete the UI in the Debugger/Sources tab. 1522999 1 webkit-bug-importer 2019-04-01 12:23:17 -0700 <rdar://problem/49489319> 1523000 2 webkit-bug-importer 2019-04-01 12:23:19 -0700 <rdar://problem/49489318> 1523067 3 366423 hi 2019-04-01 14:36:43 -0700 Created attachment 366423 Patch 1523118 4 366423 joepeck 2019-04-01 16:10:55 -0700 Comment on attachment 366423 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366423&action=review r=me > Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js:309 > + WI.domManager.removeEventListenerBreakpointsForNode(domNode); Nice! 1523127 5 366423 commit-queue 2019-04-01 16:38:50 -0700 Comment on attachment 366423 Patch Clearing flags on attachment: 366423 Committed r243722: <https://trac.webkit.org/changeset/243722> 1523128 6 commit-queue 2019-04-01 16:38:52 -0700 All reviewed patches have been landed. Closing bug. 366423 2019-04-01 14:36:43 -0700 2019-04-01 16:38:50 -0700 Patch bug-196453-20190401143643.patch text/plain 10951 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDMzZWY5ODBjMDE2YmRjNDBkMTg3YTc5OTFkOWM4 OTEzNjU3ZGI5ZDcuLmQwMjUxZjRmNjhhZjYyYjE0ZjY0NzU4YTIzMjQ3OGQ3ZmFlZTk3YmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTA0LTAxICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBE T01EZWJ1Z2dlcjogZGlzYWJsaW5nIGEgYnJlYWtwb2ludCBmb3IgYSBzcGVjaWZpYyBldmVudCBs aXN0ZW5lciByZW1vdmVzIGl0IGZyb20gdGhlIFVJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY0NTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5 NDg5MzE4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFsbG93IGJyZWFrcG9pbnRzIGZvciBzcGVjaWZpYyBldmVudCBsaXN0ZW5lcnMgdG8gYmUgZGlz YWJsZWQsIHJhdGhlciB0aGFuIGltbWVkaXRhdGVseQorICAgICAgICByZW1vdmluZy9kZWxldGlu ZyB0aGVtIHdoZW4gdGhleSBhcmUgYWJvdXQgdG8gYmVjb21lIGRpc2FibGVkLiBUaGlzIHByZXNl cnZlcyB0aGUgZXhpc3RpbmcKKyAgICAgICAgZnVuY3Rpb25hbGl0eSwgYnV0IG5vdyBhbGxvd3Mg Zm9yIHRoZSB0cmVlIGVsZW1lbnQgdG8gc3RheSBpbiB0aGUgVUkgaW4gYSBkaXNhYmxlZCBzdGF0 ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qczoK KyAgICAgICAgKFdJLkRPTU1hbmFnZXIpOgorICAgICAgICAoV0kuRE9NTWFuYWdlci5wcm90b3R5 cGUuc2V0QnJlYWtwb2ludEZvckV2ZW50TGlzdGVuZXIpOgorICAgICAgICAoV0kuRE9NTWFuYWdl ci5wcm90b3R5cGUucmVtb3ZlQnJlYWtwb2ludEZvckV2ZW50TGlzdGVuZXIpOgorICAgICAgICAo V0kuRE9NTWFuYWdlci5wcm90b3R5cGUucmVtb3ZlRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzRm9y Tm9kZSk6IEFkZGVkLgorICAgICAgICAoV0kuRE9NTWFuYWdlci5wcm90b3R5cGUuX3VwZGF0ZUV2 ZW50QnJlYWtwb2ludCk6IEFkZGVkLgorICAgICAgICAoV0kuRE9NTWFuYWdlci5wcm90b3R5cGUu X2hhbmRsZUV2ZW50QnJlYWtwb2ludERpc2FibGVkU3RhdGVDaGFuZ2VkKTogQWRkZWQuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qczoK KyAgICAgICAgKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5wcm90b3R5cGUuX2hhbmRsZUV2ZW50QnJl YWtwb2ludERpc2FibGVkU3RhdGVDaGFuZ2VkKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvRXZlbnRCcmVha3BvaW50VHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5FdmVudEJy ZWFrcG9pbnRUcmVlRWxlbWVudC5wcm90b3R5cGUucG9wdWxhdGVDb250ZXh0TWVudSk6CisgICAg ICAgIChXSS5FdmVudEJyZWFrcG9pbnRUcmVlRWxlbWVudC5wcm90b3R5cGUuX3RvZ2dsZUJyZWFr cG9pbnQpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxp dGllcy5qczoKKyAgICAgICAgKFdJLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JET01Ob2RlQnJl YWtwb2ludHMpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01Ob2RlVHJlZUVs ZW1lbnQuanM6CisgICAgICAgIChXSS5ET01Ob2RlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGVs ZXRlKToKKwogMjAxOS0wMy0yOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUu Y29tPgogCiAgICAgICAgIERlbGV0ZSBXZWJNZXRhbCBpbXBsZW1lbnRhdGlvbiBpbiBmYXZvciBv ZiBXZWJHUFUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTURlYnVnZ2VyTWFuYWdlci5qcwppbmRleCBl NzFkMjJjNjQ0MDkzZjAwZTIwM2U0NDRiNWFlYzk1NmYyY2EzODg4Li5jNWUwNTQ4YmZkZDU1ZjQ0 ZjFjZTM4M2I4ZTlkNTdiNjMzNGQzOGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01EZWJ1Z2dlck1hbmFnZXIuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NRGVidWdn ZXJNYW5hZ2VyLmpzCkBAIC01NTQsNiArNTU0LDExIEBAIFdJLkRPTURlYnVnZ2VyTWFuYWdlciA9 IGNsYXNzIERPTURlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgIF9oYW5kbGVF dmVudEJyZWFrcG9pbnREaXNhYmxlZFN0YXRlQ2hhbmdlZChldmVudCkKICAgICB7CiAgICAgICAg IGxldCBicmVha3BvaW50ID0gZXZlbnQudGFyZ2V0OworCisgICAgICAgIC8vIFNwZWNpZmljIGV2 ZW50IGxpc3RlbmVyIGJyZWFrcG9pbnRzIGFyZSBoYW5kbGVkIGJ5IGBET01NYW5hZ2VyYC4KKyAg ICAgICAgaWYgKGJyZWFrcG9pbnQuZXZlbnRMaXN0ZW5lcikKKyAgICAgICAgICAgIHJldHVybjsK KwogICAgICAgICBmb3IgKGxldCB0YXJnZXQgb2YgV0kudGFyZ2V0cykgewogICAgICAgICAgICAg aWYgKHRhcmdldC5ET01EZWJ1Z2dlckFnZW50KQogICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0 ZUV2ZW50QnJlYWtwb2ludChicmVha3BvaW50LCB0YXJnZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTU1hbmFn ZXIuanMKaW5kZXggZGQ1MmM0ZTZmMGVkYTJhZWZjZGY4ZGM4NGE3YjdjNzUzNjI1YjYxOS4uZjY4 ZDg5NDA5YzA0MTE1N2U4OTk5ZWYzNjFiODI0MzZlMjgzZTFhNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NTWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01N YW5hZ2VyLmpzCkBAIC01MCw2ICs1MCw4IEBAIFdJLkRPTU1hbmFnZXIgPSBjbGFzcyBET01NYW5h Z2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX2hhc1JlcXVlc3RlZERvY3VtZW50 ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3BlbmRpbmdEb2N1bWVudFJlcXVlc3RDYWxsYmFja3Mg PSBudWxsOwogCisgICAgICAgIFdJLkV2ZW50QnJlYWtwb2ludC5hZGRFdmVudExpc3RlbmVyKFdJ LkV2ZW50QnJlYWtwb2ludC5FdmVudC5EaXNhYmxlZFN0YXRlQ2hhbmdlZCwgdGhpcy5faGFuZGxl RXZlbnRCcmVha3BvaW50RGlzYWJsZWRTdGF0ZUNoYW5nZWQsIHRoaXMpOworCiAgICAgICAgIFdJ LkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV0kuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlkQ2hh bmdlLCB0aGlzLl9tYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMpOwogICAgIH0KIApAQCAtNTky LDM0ICs1OTQsNDYgQEAgV0kuRE9NTWFuYWdlciA9IGNsYXNzIERPTU1hbmFnZXIgZXh0ZW5kcyBX SS5PYmplY3QKIAogICAgIHNldEJyZWFrcG9pbnRGb3JFdmVudExpc3RlbmVyKGV2ZW50TGlzdGVu ZXIpCiAgICAgewotICAgICAgICBsZXQgYnJlYWtwb2ludCA9IG5ldyBXSS5FdmVudEJyZWFrcG9p bnQoV0kuRXZlbnRCcmVha3BvaW50LlR5cGUuTGlzdGVuZXIsIGV2ZW50TGlzdGVuZXIudHlwZSwg e2V2ZW50TGlzdGVuZXJ9KTsKKyAgICAgICAgbGV0IGJyZWFrcG9pbnQgPSB0aGlzLl9icmVha3Bv aW50c0ZvckV2ZW50TGlzdGVuZXJzLmdldChldmVudExpc3RlbmVyLmV2ZW50TGlzdGVuZXJJZCk7 CisgICAgICAgIGlmIChicmVha3BvaW50KSB7CisgICAgICAgICAgICBjb25zb2xlLmFzc2VydChi cmVha3BvaW50LmRpc2FibGVkKTsKKyAgICAgICAgICAgIGJyZWFrcG9pbnQuZGlzYWJsZWQgPSBm YWxzZTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGJyZWFrcG9p bnQgPSBuZXcgV0kuRXZlbnRCcmVha3BvaW50KFdJLkV2ZW50QnJlYWtwb2ludC5UeXBlLkxpc3Rl bmVyLCBldmVudExpc3RlbmVyLnR5cGUsIHtldmVudExpc3RlbmVyfSk7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KCFicmVha3BvaW50LmRpc2FibGVkKTsKKwogICAgICAgICB0aGlzLl9icmVha3Bv aW50c0ZvckV2ZW50TGlzdGVuZXJzLnNldChldmVudExpc3RlbmVyLmV2ZW50TGlzdGVuZXJJZCwg YnJlYWtwb2ludCk7CiAKLSAgICAgICAgRE9NQWdlbnQuc2V0QnJlYWtwb2ludEZvckV2ZW50TGlz dGVuZXIoZXZlbnRMaXN0ZW5lci5ldmVudExpc3RlbmVySWQsIChlcnJvcikgPT4gewotICAgICAg ICAgICAgaWYgKGVycm9yKSB7Ci0gICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcihlcnJvcik7 Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQorICAgICAgICBmb3IgKGxl dCB0YXJnZXQgb2YgV0kudGFyZ2V0cykgeworICAgICAgICAgICAgaWYgKHRhcmdldC5ET01BZ2Vu dCkKKyAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVFdmVudEJyZWFrcG9pbnQoYnJlYWtwb2lu dCwgdGFyZ2V0KTsKKyAgICAgICAgfQogCi0gICAgICAgICAgICBXSS5kb21EZWJ1Z2dlck1hbmFn ZXIuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkRPTURlYnVnZ2VyTWFuYWdlci5FdmVudC5F dmVudEJyZWFrcG9pbnRBZGRlZCwge2JyZWFrcG9pbnR9KTsKLSAgICAgICAgfSk7CisgICAgICAg IFdJLmRvbURlYnVnZ2VyTWFuYWdlci5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuRE9NRGVi dWdnZXJNYW5hZ2VyLkV2ZW50LkV2ZW50QnJlYWtwb2ludEFkZGVkLCB7YnJlYWtwb2ludH0pOwog ICAgIH0KIAogICAgIHJlbW92ZUJyZWFrcG9pbnRGb3JFdmVudExpc3RlbmVyKGV2ZW50TGlzdGVu ZXIpCiAgICAgewotICAgICAgICBsZXQgYnJlYWtwb2ludCA9IHRoaXMuX2JyZWFrcG9pbnRzRm9y RXZlbnRMaXN0ZW5lcnMuZ2V0KGV2ZW50TGlzdGVuZXIuZXZlbnRMaXN0ZW5lcklkKTsKKyAgICAg ICAgbGV0IGJyZWFrcG9pbnQgPSB0aGlzLl9icmVha3BvaW50c0ZvckV2ZW50TGlzdGVuZXJzLnRh a2UoZXZlbnRMaXN0ZW5lci5ldmVudExpc3RlbmVySWQpOwogICAgICAgICBjb25zb2xlLmFzc2Vy dChicmVha3BvaW50KTsKIAotICAgICAgICB0aGlzLl9icmVha3BvaW50c0ZvckV2ZW50TGlzdGVu ZXJzLmRlbGV0ZShldmVudExpc3RlbmVyLmV2ZW50TGlzdGVuZXJJZCk7CisgICAgICAgIGZvciAo bGV0IHRhcmdldCBvZiBXSS50YXJnZXRzKSB7CisgICAgICAgICAgICBpZiAodGFyZ2V0LkRPTUFn ZW50KQorICAgICAgICAgICAgICAgIHRhcmdldC5ET01BZ2VudC5yZW1vdmVCcmVha3BvaW50Rm9y RXZlbnRMaXN0ZW5lcihldmVudExpc3RlbmVyLmV2ZW50TGlzdGVuZXJJZCk7CisgICAgICAgIH0K IAotICAgICAgICBET01BZ2VudC5yZW1vdmVCcmVha3BvaW50Rm9yRXZlbnRMaXN0ZW5lcihldmVu dExpc3RlbmVyLmV2ZW50TGlzdGVuZXJJZCwgKGVycm9yKSA9PiB7Ci0gICAgICAgICAgICBpZiAo ZXJyb3IpIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKGVycm9yKTsKLSAgICAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9CisgICAgICAgIFdJLmRvbURlYnVnZ2VyTWFu YWdlci5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuRE9NRGVidWdnZXJNYW5hZ2VyLkV2ZW50 LkV2ZW50QnJlYWtwb2ludFJlbW92ZWQsIHticmVha3BvaW50fSk7CisgICAgfQogCi0gICAgICAg ICAgICBXSS5kb21EZWJ1Z2dlck1hbmFnZXIuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkRP TURlYnVnZ2VyTWFuYWdlci5FdmVudC5FdmVudEJyZWFrcG9pbnRSZW1vdmVkLCB7YnJlYWtwb2lu dH0pOwotICAgICAgICB9KTsKKyAgICByZW1vdmVFdmVudExpc3RlbmVyQnJlYWtwb2ludHNGb3JO b2RlKGRvbU5vZGUpCisgICAgeworICAgICAgICBmb3IgKGxldCBicmVha3BvaW50IG9mIEFycmF5 LmZyb20odGhpcy5fYnJlYWtwb2ludHNGb3JFdmVudExpc3RlbmVycy52YWx1ZXMoKSkpIHsKKyAg ICAgICAgICAgIGxldCBldmVudExpc3RlbmVyID0gYnJlYWtwb2ludC5ldmVudExpc3RlbmVyOwor ICAgICAgICAgICAgaWYgKGV2ZW50TGlzdGVuZXIubm9kZUlkID09PSBkb21Ob2RlLmlkKQorICAg ICAgICAgICAgICAgIHRoaXMucmVtb3ZlQnJlYWtwb2ludEZvckV2ZW50TGlzdGVuZXIoZXZlbnRM aXN0ZW5lcik7CisgICAgICAgIH0KICAgICB9CiAKICAgICBicmVha3BvaW50Rm9yRXZlbnRMaXN0 ZW5lcklkKGV2ZW50TGlzdGVuZXJJZCkKQEAgLTYyNyw2ICs2NDEsOCBAQCBXSS5ET01NYW5hZ2Vy ID0gY2xhc3MgRE9NTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICByZXR1cm4gdGhp cy5fYnJlYWtwb2ludHNGb3JFdmVudExpc3RlbmVycy5nZXQoZXZlbnRMaXN0ZW5lcklkKSB8fCBu dWxsOwogICAgIH0KIAorICAgIC8vIFByaXZhdGUKKwogICAgIF9idWlsZEhpZ2hsaWdodENvbmZp Zyhtb2RlID0gImFsbCIpCiAgICAgewogICAgICAgICBsZXQgaGlnaGxpZ2h0Q29uZmlnID0ge3No b3dJbmZvOiBtb2RlID09PSAiYWxsIn07CkBAIC02NDYsNyArNjYyLDMwIEBAIFdJLkRPTU1hbmFn ZXIgPSBjbGFzcyBET01NYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHJldHVybiBo aWdobGlnaHRDb25maWc7CiAgICAgfQogCi0gICAgLy8gUHJpdmF0ZQorICAgIF91cGRhdGVFdmVu dEJyZWFrcG9pbnQoYnJlYWtwb2ludCwgdGFyZ2V0KQorICAgIHsKKyAgICAgICAgbGV0IGV2ZW50 TGlzdGVuZXIgPSBicmVha3BvaW50LmV2ZW50TGlzdGVuZXI7CisgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KGV2ZW50TGlzdGVuZXIpOworCisgICAgICAgIGlmIChicmVha3BvaW50LmRpc2FibGVkKQor ICAgICAgICAgICAgdGFyZ2V0LkRPTUFnZW50LnJlbW92ZUJyZWFrcG9pbnRGb3JFdmVudExpc3Rl bmVyKGV2ZW50TGlzdGVuZXIuZXZlbnRMaXN0ZW5lcklkKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgdGFyZ2V0LkRPTUFnZW50LnNldEJyZWFrcG9pbnRGb3JFdmVudExpc3RlbmVyKGV2ZW50 TGlzdGVuZXIuZXZlbnRMaXN0ZW5lcklkKTsKKyAgICB9CisKKyAgICBfaGFuZGxlRXZlbnRCcmVh a3BvaW50RGlzYWJsZWRTdGF0ZUNoYW5nZWQoZXZlbnQpCisgICAgeworICAgICAgICBsZXQgYnJl YWtwb2ludCA9IGV2ZW50LnRhcmdldDsKKworICAgICAgICAvLyBOb24tc3BlY2lmaWMgZXZlbnQg bGlzdGVuZXIgYnJlYWtwb2ludHMgYXJlIGhhbmRsZWQgYnkgYERPTURlYnVnZ2VyTWFuYWdlcmAu CisgICAgICAgIGlmICghYnJlYWtwb2ludC5ldmVudExpc3RlbmVyKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIGZvciAobGV0IHRhcmdldCBvZiBXSS50YXJnZXRzKSB7CisgICAgICAg ICAgICBpZiAodGFyZ2V0LkRPTUFnZW50KQorICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUV2 ZW50QnJlYWtwb2ludChicmVha3BvaW50LCB0YXJnZXQpOworICAgICAgICB9CisgICAgfQogCiAg ICAgX21haW5SZXNvdXJjZURpZENoYW5nZShldmVudCkKICAgICB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRN ZW51VXRpbGl0aWVzLmpzCmluZGV4IGY4OGQxMDVjZmZiMWJlNzkyNTk5OGU1YjVhZDc1ZTNhOWE4 OGQ4M2IuLmUxYjEyNmYzZWI4ZjM5MTFkODY2ZTFkOGZlMzNjOGZlMjA0MDk2ZDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51 VXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzCkBAIC0zMDYsNiArMzA2LDcgQEAgV0kuYXBwZW5k Q29udGV4dE1lbnVJdGVtc0ZvckRPTU5vZGVCcmVha3BvaW50cyA9IGZ1bmN0aW9uKGNvbnRleHRN ZW51LCBkb21Ob2RlLAogCiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV0kuVUlTdHJp bmcoIkRlbGV0ZSBCcmVha3BvaW50cyIpLCBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIFdJLmRv bURlYnVnZ2VyTWFuYWdlci5yZW1vdmVET01CcmVha3BvaW50c0Zvck5vZGUoZG9tTm9kZSk7Cisg ICAgICAgICAgICBXSS5kb21NYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXJCcmVha3BvaW50c0Zv ck5vZGUoZG9tTm9kZSk7CiAgICAgICAgIH0pOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01Ob2RlVHJlZUVsZW1lbnQu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01Ob2RlVHJl ZUVsZW1lbnQuanMKaW5kZXggNTQ1NDJhNGJlMjM2MmRkYjQ1MjVmMDRiZjFkNDlkNzcwNmJjOTIy MS4uMWY1ZDE3MTgzZTQ1M2RjMzE3YjU5Y2U3MDAwOWUyZmEyMDVjNDk5OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZVRyZWVFbGVt ZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TU5vZGVUcmVlRWxlbWVudC5qcwpAQCAtNDYsMTEgKzQ2LDcgQEAgV0kuRE9NTm9kZVRyZWVFbGVt ZW50ID0gY2xhc3MgRE9NTm9kZVRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJhbFRyZWVFbGVt ZW50CiAgICAgICAgIHRoaXMuX19kZWxldGVkVmlhRGVsZXRlS2V5Ym9hcmRTaG9ydGN1dCA9IHRy dWU7CiAKICAgICAgICAgV0kuZG9tRGVidWdnZXJNYW5hZ2VyLnJlbW92ZURPTUJyZWFrcG9pbnRz Rm9yTm9kZSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0KTsKLQotICAgICAgICBmb3IgKGxldCB0cmVl RWxlbWVudCBvZiB0aGlzLmNoaWxkcmVuKSB7Ci0gICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQg aW5zdGFuY2VvZiBXSS5FdmVudEJyZWFrcG9pbnRUcmVlRWxlbWVudCkKLSAgICAgICAgICAgICAg ICB0cmVlRWxlbWVudC5vbmRlbGV0ZSgpOwotICAgICAgICB9CisgICAgICAgIFdJLmRvbU1hbmFn ZXIucmVtb3ZlRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzRm9yTm9kZSh0aGlzLnJlcHJlc2VudGVk T2JqZWN0KTsKIAogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FdmVudEJyZWFrcG9pbnRUcmVl RWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0V2 ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCmluZGV4IGI4YTFiNTIxZDU5MGMyNjM0MjhjZDFj ODAyM2EwY2Q1ZjVkNzAzNGIuLjA0ZGRkYTIzMDhhZjQyMDNlYTNjMWEyM2Q5NjFhZTM0ZGFiMWMw NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0V2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0V2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCkBAIC0x MTAsMTAgKzExMCw5IEBAIFdJLkV2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50ID0gY2xhc3MgRXZl bnRCcmVha3BvaW50VHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5HZW5lCiAgICAgcG9wdWxhdGVDb250 ZXh0TWVudShjb250ZXh0TWVudSwgZXZlbnQpCiAgICAgewogICAgICAgICBsZXQgYnJlYWtwb2lu dCA9IHRoaXMucmVwcmVzZW50ZWRPYmplY3Q7Ci0gICAgICAgIGlmICghYnJlYWtwb2ludC5ldmVu dExpc3RlbmVyKSB7Ci0gICAgICAgICAgICBsZXQgbGFiZWwgPSBicmVha3BvaW50LmRpc2FibGVk ID8gV0kuVUlTdHJpbmcoIkVuYWJsZSBCcmVha3BvaW50IikgOiBXSS5VSVN0cmluZygiRGlzYWJs ZSBCcmVha3BvaW50Iik7Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKGxhYmVs LCB0aGlzLl90b2dnbGVCcmVha3BvaW50LmJpbmQodGhpcykpOwotICAgICAgICB9CisKKyAgICAg ICAgbGV0IGxhYmVsID0gYnJlYWtwb2ludC5kaXNhYmxlZCA/IFdJLlVJU3RyaW5nKCJFbmFibGUg QnJlYWtwb2ludCIpIDogV0kuVUlTdHJpbmcoIkRpc2FibGUgQnJlYWtwb2ludCIpOworICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKGxhYmVsLCB0aGlzLl90b2dnbGVCcmVha3BvaW50LmJp bmQodGhpcykpOwogCiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOwogCkBA IC0xNDYsMTEgKzE0NSw2IEBAIFdJLkV2ZW50QnJlYWtwb2ludFRyZWVFbGVtZW50ID0gY2xhc3Mg RXZlbnRCcmVha3BvaW50VHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5HZW5lCiAKICAgICBfdG9nZ2xl QnJlYWtwb2ludCgpCiAgICAgewotICAgICAgICBpZiAodGhpcy5yZXByZXNlbnRlZE9iamVjdC5l dmVudExpc3RlbmVyKSB7Ci0gICAgICAgICAgICBXSS5kb21NYW5hZ2VyLnJlbW92ZUJyZWFrcG9p bnRGb3JFdmVudExpc3RlbmVyKHRoaXMucmVwcmVzZW50ZWRPYmplY3QuZXZlbnRMaXN0ZW5lcik7 Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQogICAgICAgICB0aGlzLnJlcHJlc2Vu dGVkT2JqZWN0LmRpc2FibGVkID0gIXRoaXMucmVwcmVzZW50ZWRPYmplY3QuZGlzYWJsZWQ7CiAg ICAgfQogCg==