145068 2015-05-15 12:35:07 -0700 Web Inspector: Fix some possible event listener leakers in content views 2015-05-15 13:48:43 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1095200 0 joepeck 2015-05-15 12:35:07 -0700 * SUMMARY Fix some possible event listener leakers in content views. Now that tabs and their content views can be closed, sometimes some ContentViews which always existed can be closed. Global event listeners like "WebInspector.*.addEventListener" and "window.addEventListener" should be cleaned up. 1095201 1 253217 joepeck 2015-05-15 12:36:16 -0700 Created attachment 253217 [PATCH] Proposed Fix 1095206 2 253217 timothy 2015-05-15 12:58:32 -0700 Comment on attachment 253217 [PATCH] Proposed Fix Awesome! 1095227 3 253217 commit-queue 2015-05-15 13:48:38 -0700 Comment on attachment 253217 [PATCH] Proposed Fix Clearing flags on attachment: 253217 Committed r184411: <http://trac.webkit.org/changeset/184411> 1095228 4 commit-queue 2015-05-15 13:48:43 -0700 All reviewed patches have been landed. Closing bug. 253217 2015-05-15 12:36:16 -0700 2015-05-15 13:48:38 -0700 [PATCH] Proposed Fix leaks.patch text/plain 10770 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcwYWY0YWMuLmI4ZWU3OGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDE1LTA1LTE1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IHNv bWUgcG9zc2libGUgZXZlbnQgbGlzdGVuZXIgbGVha2VycyBpbiBjb250ZW50IHZpZXdzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUwNjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cgdGhhdCBzb21l IGNvbnRlbnQgdmlld3MgY2FuIGJlIGNsb3NlZCB0aGF0IHdlcmVuJ3QgY2xvc2FibGUgYmVmb3Jl LCBlbnN1cmUKKyAgICAgICAgd2UgY2xlYW4gdXAgYWZ0ZXIgZ2xvYmFsIGV2ZW50IGxpc3RlbmVy cyB0aGF0IG1heSBzdHJvbmdseSByZWZlcmVuY2UgInRoaXMiLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RE9NVHJlZU91dGxpbmUucHJvdG90eXBlLmNsb3NlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlv dXRUaW1lbGluZVZpZXcucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5l dHdvcmtUaW1lbGluZVZpZXcucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5wcm90b3R5cGUuY2xvc2VkKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdENvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUuY2xvc2VkKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZS5jbG9zZSk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5 cGUuY2xvc2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdy aWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUu Y2xvc2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlw ZS5oYW5kbGVFdmVudCk6CisKKzIwMTUtMDUtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJv QGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbml0aWF0b3IgUG9wb3ZlcnMg bm8gbG9uZ2VyIHdvcmsgaW4gTGF5b3V0IFRpbWVsaW5lCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUwNjcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRW aWV3LmpzCmluZGV4IDU5MDkwYzUuLmEwMzk0OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZp ZXcuanMKQEAgLTEwNSw2ICsxMDUsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3 LnByb3RvdHlwZSA9IHsKIAogICAgIGNsb3NlZDogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAg V2ViSW5zcGVjdG9yLnNob3dQYWludFJlY3RzU2V0dGluZy5yZW1vdmVFdmVudExpc3RlbmVyKG51 bGwsIG51bGwsIHRoaXMpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NoYWRvd0RPTVNldHRp bmcucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKICAgICAgICAgV2ViSW5z cGVjdG9yLmRvbVRyZWVNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhp cyk7CiAKICAgICAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUuY2xvc2UoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5l LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91 dGxpbmUuanMKaW5kZXggMGMwNDQwNC4uNmM2MTM1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMK QEAgLTc0LDYgKzc0LDggQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lID0gY2xhc3MgRE9N VHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZU91dGwKIAogICAgIGNsb3NlKCkK ICAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U2hhZG93RE9NU2V0dGluZy5yZW1vdmVF dmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworCiAgICAgICAgIGlmICh0aGlzLl9lbGVt ZW50c1RyZWVVcGRhdGVyKSB7CiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50c1RyZWVVcGRhdGVy LmNsb3NlKCk7CiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50c1RyZWVVcGRhdGVyID0gbnVsbDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xh eW91dFRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcwppbmRleCBmYTJmYjc4Li5iYmM3NjAwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRU aW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTGF5b3V0VGltZWxpbmVWaWV3LmpzCkBAIC0xMjcsNiArMTI3LDggQEAgV2ViSW5zcGVj dG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBjb25z b2xlLmFzc2VydCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y LlRpbWVsaW5lKTsKICAgICAgICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZW1vdmVFdmVudExp c3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworCisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNsb3Nl ZCgpOwogICAgIH0sCiAKICAgICBmaWx0ZXJEaWRDaGFuZ2U6IGZ1bmN0aW9uKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1l bGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IDhhMzMyODcuLmRlODZlZDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RpbWVsaW5lVmlldy5qcwpAQCAtMTI5LDYgKzEyOSw4IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGNvbnNvbGUu YXNzZXJ0KHRoaXMucmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVGlt ZWxpbmUpOwogICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LnJlbW92ZUV2ZW50TGlzdGVu ZXIobnVsbCwgbnVsbCwgdGhpcyk7CisKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuY2xvc2VkKCk7 CiAgICAgfSwKIAogICAgIHVwZGF0ZUxheW91dDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1l bGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S ZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcwppbmRleCBhMjExZjQ3Li5lYmMwYmE3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJp bmdGcmFtZVRpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcwpAQCAtMTAwLDYgKzEw MCw4IEBAIFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0 IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lKTsKICAgICAgICAgdGhpcy5yZXByZXNl bnRlZE9iamVjdC5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworCisgICAg ICAgIHRoaXMuX2RhdGFHcmlkLmNsb3NlZCgpOwogICAgIH0sCiAKICAgICB1cGRhdGVMYXlvdXQ6 IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0Q29udGVudFZpZXcuanMKaW5kZXggMGM0M2NkNC4uOTAx YmFhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2NyaXB0Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU2NyaXB0Q29udGVudFZpZXcuanMKQEAgLTExMiw2ICsxMTIsOCBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0Q29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgY2xvc2Vk OiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd0phdmFTY3JpcHRU eXBlSW5mb3JtYXRpb25TZXR0aW5nLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhp cyk7CisKICAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5jbG9zZSgpOwogICAgIH0sCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRp bWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NjcmlwdFRpbWVsaW5lVmlldy5qcwppbmRleCAyNjA0MTNiLi40ZmIyMDVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NyaXB0VGltZWxpbmVWaWV3LmpzCkBAIC0xMDUsNiArMTA1LDggQEAgV2ViSW5zcGVjdG9yLlNj cmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBjb25zb2xlLmFz c2VydCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVs aW5lKTsKICAgICAgICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZW1vdmVFdmVudExpc3RlbmVy KG51bGwsIG51bGwsIHRoaXMpOworCisgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNsb3NlZCgpOwog ICAgIH0sCiAKICAgICB1cGRhdGVMYXlvdXQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9y LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29k ZVRleHRFZGl0b3IuanMKaW5kZXggYmZkNWZjZS4uM2ZmMmNkYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3Iu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNl Q29kZVRleHRFZGl0b3IuanMKQEAgLTEyOCwxNSArMTI4LDggQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZUNvZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3IgZXh0ZW5kcyBXZWJJ bnNwZWMKICAgICBjbG9zZSgpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fc3VwcG9ydHNEZWJ1 Z2dpbmcpIHsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnJlbW92ZUV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQuRXZlbnQuRGlzYWJsZWRTdGF0ZURpZENo YW5nZSwgdGhpcy5fYnJlYWtwb2ludFN0YXR1c0RpZENoYW5nZSwgdGhpcyk7Ci0gICAgICAgICAg ICBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5CcmVha3BvaW50LkV2ZW50LkF1dG9Db250aW51ZURpZENoYW5nZSwgdGhpcy5fYnJlYWtwb2lu dFN0YXR1c0RpZENoYW5nZSwgdGhpcyk7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuQnJlYWtw b2ludC5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LkV2ZW50LlJl c29sdmVkU3RhdGVEaWRDaGFuZ2UsIHRoaXMuX2JyZWFrcG9pbnRTdGF0dXNEaWRDaGFuZ2UsIHRo aXMpOwotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQucmVtb3ZlRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5FdmVudC5Mb2NhdGlvbkRpZENoYW5nZSwgdGhp cy5fdXBkYXRlQnJlYWtwb2ludExvY2F0aW9uLCB0aGlzKTsKLQotICAgICAgICAgICAgV2ViSW5z cGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtwb2ludHNFbmFibGVkRGlkQ2hhbmdlLCB0aGlzLl9i cmVha3BvaW50c0VuYWJsZWREaWRDaGFuZ2UsIHRoaXMpOwotICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmRlYnVnZ2VyTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtwb2ludEFkZGVkLCB0aGlzLl9icmVha3BvaW50QWRkZWQs IHRoaXMpOwotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5yZW1vdmVF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1hbmFnZXIuRXZlbnQuQnJlYWtwb2lu dFJlbW92ZWQsIHRoaXMuX2JyZWFrcG9pbnRSZW1vdmVkLCB0aGlzKTsKLSAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRGVidWdnZXJNYW5hZ2VyLkV2ZW50LkFjdGl2ZUNhbGxGcmFtZURpZENoYW5nZSwgdGhpcy5f YWN0aXZlQ2FsbEZyYW1lRGlkQ2hhbmdlLCB0aGlzKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5CcmVha3BvaW50LnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIo bnVsbCwgbnVsbCwgdGhpcyk7CiAKICAgICAgICAgICAgIGlmICh0aGlzLl9hY3RpdmVDYWxsRnJh bWVTb3VyY2VDb2RlTG9jYXRpb24pIHsKICAgICAgICAgICAgICAgICB0aGlzLl9hY3RpdmVDYWxs RnJhbWVTb3VyY2VDb2RlTG9jYXRpb24ucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu U291cmNlQ29kZUxvY2F0aW9uLkV2ZW50LkxvY2F0aW9uQ2hhbmdlZCwgdGhpcy5fYWN0aXZlQ2Fs bEZyYW1lU291cmNlQ29kZUxvY2F0aW9uQ2hhbmdlZCwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRS ZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IGJjYjg2ODcuLjNlM2NjMjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNv bnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC0xMTYsNiArMTE2LDggQEAgV2ViSW5z cGVjdG9yLlRleHRSZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgV2Vi SW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmNsb3NlZC5jYWxsKHRoaXMp OwogCiAgICAgICAgIHRoaXMucmVzb3VyY2UucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxs LCB0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnByb2JlTWFuYWdlci5yZW1vdmVFdmVudExp c3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd0phdmFT Y3JpcHRUeXBlSW5mb3JtYXRpb25TZXR0aW5nLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVs bCwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5jbG9zZSgpOwogICAgIH0sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZURhdGFHcmlkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVEYXRhR3JpZC5qcwppbmRleCA4ZmI2ZjI2Li45ZmRlZmNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFH cmlkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lRGF0YUdyaWQuanMKQEAgLTYxLDcgKzYxLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGF0YUdyaWQgPSBmdW5jdGlvbih0cmVlT3V0bGluZSwgY29sdW1ucywgZGVsZWdhdGUsIGVkaXRD YWwKICAgICB0aGlzLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50 LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdlZCwg dGhpcyk7CiAgICAgdGhpcy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5F dmVudC5Tb3J0Q2hhbmdlZCwgdGhpcy5fc29ydCwgdGhpcyk7CiAKLSAgICB3aW5kb3cuYWRkRXZl bnRMaXN0ZW5lcigicmVzaXplIiwgdGhpcy5fd2luZG93UmVzaXplZC5iaW5kKHRoaXMpKTsKKyAg ICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigicmVzaXplIiwgdGhpcyk7CiB9OwogCiBXZWJJbnNw ZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5TdHlsZUNsYXNzTmFtZSA9ICJ0aW1lbGluZSI7CkBAIC0x MTcsNiArMTE3LDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5faGlkZVBvcG92ZXIoKTsKICAgICB9LAogCisgICAgY2xvc2VkOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICB3aW5kb3cucmVtb3ZlRXZlbnRMaXN0ZW5lcigicmVz aXplIiwgdGhpcyk7CisgICAgfSwKKwogICAgIHRyZWVFbGVtZW50Rm9yRGF0YUdyaWROb2RlOiBm dW5jdGlvbihkYXRhR3JpZE5vZGUpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fdHJlZU91 dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci50cmVlRWxlbWVudEZvckRhdGFHcmlkTm9kZShkYXRh R3JpZE5vZGUpOwpAQCAtMTkwLDYgKzE5NSwxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRh R3JpZC5wcm90b3R5cGUgPSB7CiAKICAgICAvLyBQcm90ZWN0ZWQKIAorICAgIGhhbmRsZUV2ZW50 OiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGV2ZW50LnR5 cGUgPT09ICJyZXNpemUiKTsKKworICAgICAgICB0aGlzLl93aW5kb3dSZXNpemVkKGV2ZW50KTsK KyAgICB9LAorCiAgICAgZGF0YUdyaWROb2RlTmVlZHNSZWZyZXNoOiBmdW5jdGlvbihkYXRhR3Jp ZE5vZGUpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2RpcnR5RGF0YUdyaWROb2RlcykK