156385 2016-04-07 20:23:12 -0700 Web Inspector: Attempting to dismiss a popover that is already being dismissed causes an error 2016-04-08 09:05:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1182026 0 mattbaker 2016-04-07 20:23:12 -0700 * SUMMARY Attempting to dismiss a popover that is already being dismissed causes an error. * STEPS TO REPRODUCE 1. Set breakpoint, open Edit Breakpoint popover 2. Condition field has the focus. Hit Enter twice in quick succession. => BreakpointPopoverController.js:249:22: CONSOLE ERROR TypeError: null is not an object (evaluating 'this._popover.dismiss') 1. Debugger tab > Scope Chain sidebar panel > Add Watch Expression 2. Condition field has the focus. Hit Enter twice in quick succession. => ScopeChainDetailsSidebarPanel.js:453:46: CONSOLE ERROR TypeError: null is not an object (evaluating 'this._codeMirror.getValue') 1182028 1 webkit-bug-importer 2016-04-07 20:23:26 -0700 <rdar://problem/25617962> 1182036 2 275973 mattbaker 2016-04-07 20:34:04 -0700 Created attachment 275973 [Patch] Proposed Fix 1182039 3 275973 bburg 2016-04-07 20:42:14 -0700 Comment on attachment 275973 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=275973&action=review Is the dismissing flag ever cleared when the animation completes? Or do you rely on later present() calls to reset it? It seems weird to have the dismissing flag always true even once it's out of the DOM. > Source/WebInspectorUI/ChangeLog:24 > +2016-04-07 Matt Baker <mattbaker@apple.com> You made a double changelog. 1182106 4 275984 mattbaker 2016-04-08 01:50:46 -0700 Created attachment 275984 [Patch] Proposed Fix 1182162 5 275984 commit-queue 2016-04-08 09:05:20 -0700 Comment on attachment 275984 [Patch] Proposed Fix Clearing flags on attachment: 275984 Committed r199227: <http://trac.webkit.org/changeset/199227> 1182163 6 commit-queue 2016-04-08 09:05:24 -0700 All reviewed patches have been landed. Closing bug. 275973 2016-04-07 20:34:04 -0700 2016-04-08 01:50:43 -0700 [Patch] Proposed Fix bug-156385-20160407203407.patch text/plain 4862 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 MWYwMDJkNjJkMmVhMWY1OWNjY2JiZGNmYTE4NzA1NzA3YzUzNGUzLi42NmU4YTM5MGFhZDUzZmE5 NDcwN2E0NmU0MTk5YzkyN2NiNTEzNjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0OCBAQAogMjAxNi0wNC0wNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQXR0ZW1wdGluZyB0byBkaXNtaXNzIGEgcG9wb3Zl ciB0aGF0IGlzIGFscmVhZHkgYmVpbmcgZGlzbWlzc2VkIGNhdXNlcyBhbiBlcnJvcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2Mzg1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yNTYxNzk2Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgUG9wb3ZlciBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSB0 aGUgRE9NIG9uY2UgaXQncyBmYWRlLW91dCB0cmFuc2l0aW9uCisgICAgICAgIGNvbXBsZXRlcy4g U2luY2UgUG9wb3Zlci5kaXNtaXNzIHByb2NlZWRzIGFzIGxvbmcgYXMgaXQncyBlbGVtZW50IGhh cyBhCisgICAgICAgIHBhcmVudCwgc3VjY2Vzc2l2ZSBjYWxscyB0byBkaXNtaXNzIGNhbiBydW4g YmVmb3JlIHRoZSBwb3BvdmVyIGlzIHJlbW92ZWQuCisKKyAgICAgICAgUmF0aGVyIHRoYW4gcmVs eSBvbiB0aGUgcHJlc2VuY2Ugb2YgdGhlIHBvcG92ZXIgaW4gdGhlIERPTSwgc2V0IGEgImRpc21p c3NpbmciCisgICAgICAgIGZsYWcgdGhlIGZpcnN0IHRpbWUgZGlzbWlzcyBpcyBjYWxsZWQsIGJl Zm9yZSB0aGUgZmFkZS1vdXQgYW5pbWF0aW9uIGJlZ2lucy4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvQnJlYWtwb2ludFBvcG92ZXJDb250cm9sbGVyLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRQb3BvdmVyQ29udHJvbGxlci5wcm90b3R5cGUuX2Nv bmRpdGlvbkNvZGVNaXJyb3JFc2NhcGVPckVudGVyS2V5KToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1BvcG92ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUG9wb3Zlcik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUG9wb3Zlci5wcm90b3R5cGUucHJlc2VudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUG9wb3Zlci5wcm90b3R5cGUucHJlc2VudE5ld0NvbnRlbnRXaXRoRnJh bWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlLmRpc21pc3MpOgor CisyMDE2LTA0LTA3ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBBdHRlbXB0aW5nIHRvIGRpc21pc3MgYSBwb3BvdmVyIHRoYXQgaXMg YWxyZWFkeSBiZWluZyBkaXNtaXNzZWQgY2F1c2VzIGFuIGVycm9yCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTYzODUKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzI1NjE3OTYyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9CcmVha3BvaW50UG9wb3ZlckNv bnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludFBvcG92ZXJDb250 cm9sbGVyLnByb3RvdHlwZS5fY29uZGl0aW9uQ29kZU1pcnJvckVzY2FwZU9yRW50ZXJLZXkpOgor ICAgICAgICBDaGVjayBmb3IgbnVsbCBwb3BvdmVyLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Qb3BvdmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlLnByZXNlbnQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlLnByZXNlbnROZXdDb250ZW50V2l0aEZyYW1l KToKKyAgICAgICAgUmVzZXQgZGlzbWlzc2luZyBmbGFnIHdoZW4gcHJlc2VudGluZyB0aGUgcG9w b3Zlci4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyLnByb3RvdHlwZS5kaXNtaXNzKToK KyAgICAgICAgRG8gbm90aGluZyBpZiBhbHJlYWR5IGRpc21pc3NpbmcuCisKKzIwMTYtMDQtMDcg IE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE9wZW5SZXNvdXJjZURpYWxvZyBzaG91bGQga2VlcCBpdHMgcmVzb3VyY2VzIGxpc3QgdXAt dG8tZGF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU1MzIxCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTA5Mzg5MD4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0JyZWFrcG9pbnRQ b3BvdmVyQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0JyZWFrcG9pbnRQb3BvdmVyQ29udHJvbGxlci5qcwppbmRleCBkM2IyMTg3 ODE0NWJhYmNjOTk4MmNkYzk2YmNjNmFlOGM1MTEzMTZhLi4xZjBjYjBmZmMwZGEzMDc4ZjhkZDMw ZjNkNThmZDk1MzM1YWU1NmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9CcmVha3BvaW50UG9wb3ZlckNvbnRyb2xsZXIuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQnJlYWtw b2ludFBvcG92ZXJDb250cm9sbGVyLmpzCkBAIC0yNDYsNiArMjQ2LDkgQEAgV2ViSW5zcGVjdG9y LkJyZWFrcG9pbnRQb3BvdmVyQ29udHJvbGxlciA9IGNsYXNzIEJyZWFrcG9pbnRQb3BvdmVyQ29u dHJvbGxlciBleHQKIAogICAgIF9jb25kaXRpb25Db2RlTWlycm9yRXNjYXBlT3JFbnRlcktleSgp CiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX3BvcG92ZXIpCisgICAgICAgICAgICByZXR1cm47 CisKICAgICAgICAgdGhpcy5fcG9wb3Zlci5kaXNtaXNzKCk7CiAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcwppbmRl eCBkM2EwZDIyZGM5NGNiYTQ4ZGE1MDZlMGFhYzc4ZjY1M2U4NmYxMWZkLi42MjY2OWQ1MmU3YjQ0 ZTk3NWYzY2M1MmJmYTg1NDViNzlmMmIxZWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKQEAgLTM4LDYgKzM4LDcgQEAg V2ViSW5zcGVjdG9yLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV2ViSW5zcGVjdG9y Lk9iamVjdAogICAgICAgICB0aGlzLl9wcmVmZXJyZWRFZGdlcyA9IG51bGw7CiAKICAgICAgICAg dGhpcy5fY29udGVudE5lZWRzVXBkYXRlID0gZmFsc2U7CisgICAgICAgIHRoaXMuX2Rpc21pc3Np bmcgPSBmYWxzZTsKIAogICAgICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gInBvcG92ZXIi OwpAQCAtMTA3LDYgKzEwOCw3IEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVyID0gY2xhc3MgUG9wb3Zl ciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICB7CiAgICAgICAgIHRoaXMuX3Rhcmdl dEZyYW1lID0gdGFyZ2V0RnJhbWU7CiAgICAgICAgIHRoaXMuX3ByZWZlcnJlZEVkZ2VzID0gcHJl ZmVycmVkRWRnZXM7CisgICAgICAgIHRoaXMuX2Rpc21pc3NpbmcgPSBmYWxzZTsKIAogICAgICAg ICBpZiAoIXRoaXMuX2NvbnRlbnQpCiAgICAgICAgICAgICByZXR1cm47CkBAIC0xMjAsNiArMTIy LDcgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV2ViSW5z cGVjdG9yLk9iamVjdAogICAgIHsKICAgICAgICAgdGhpcy5fY29udGVudCA9IGNvbnRlbnQ7CiAg ICAgICAgIHRoaXMuX2NvbnRlbnROZWVkc1VwZGF0ZSA9IHRydWU7CisgICAgICAgIHRoaXMuX2Rp c21pc3NpbmcgPSBmYWxzZTsKIAogICAgICAgICB0aGlzLl90YXJnZXRGcmFtZSA9IHRhcmdldEZy YW1lOwogICAgICAgICB0aGlzLl9wcmVmZXJyZWRFZGdlcyA9IHByZWZlcnJlZEVkZ2VzOwpAQCAt MTMyLDkgKzEzNSwxMSBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlciA9IGNsYXNzIFBvcG92ZXIgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICBkaXNtaXNzKCkKICAgICB7Ci0gICAgICAg IGlmICh0aGlzLl9lbGVtZW50LnBhcmVudE5vZGUgIT09IGRvY3VtZW50LmJvZHkpCisgICAgICAg IGlmICh0aGlzLl9kaXNtaXNzaW5nIHx8IHRoaXMuX2VsZW1lbnQucGFyZW50Tm9kZSAhPT0gZG9j dW1lbnQuYm9keSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICB0aGlzLl9kaXNtaXNz aW5nID0gdHJ1ZTsKKwogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9pc0xpc3RlbmluZ0Zv clBvcG92ZXJFdmVudHMpOwogICAgICAgICB0aGlzLl9pc0xpc3RlbmluZ0ZvclBvcG92ZXJFdmVu dHMgPSBmYWxzZTsKICAgICAgICAgd2luZG93LnJlbW92ZUV2ZW50TGlzdGVuZXIoIm1vdXNlZG93 biIsIHRoaXMsIHRydWUpOwo= 275984 2016-04-08 01:50:46 -0700 2016-04-08 09:05:20 -0700 [Patch] Proposed Fix bug-156385-20160408015049.patch text/plain 3828 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 MWYwMDJkNjJkMmVhMWY1OWNjY2JiZGNmYTE4NzA1NzA3YzUzNGUzLi4xOTc3OGNjYzQxMjUxNWE4 MjVhNmYxMmY1MTk5M2UzMWM4M2Q2MWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxNi0wNC0wOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQXR0ZW1wdGluZyB0byBkaXNtaXNzIGEgcG9wb3Zl ciB0aGF0IGlzIGFscmVhZHkgYmVpbmcgZGlzbWlzc2VkIGNhdXNlcyBhbiBlcnJvcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2Mzg1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yNTYxNzk2Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgUG9wb3ZlciBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSB0 aGUgRE9NIG9uY2UgaXQncyBmYWRlLW91dCB0cmFuc2l0aW9uCisgICAgICAgIGNvbXBsZXRlcy4g U2luY2UgUG9wb3Zlci5kaXNtaXNzIHByb2NlZWRzIGFzIGxvbmcgYXMgaXQncyBlbGVtZW50IGhh cyBhCisgICAgICAgIHBhcmVudCwgc3VjY2Vzc2l2ZSBjYWxscyB0byBkaXNtaXNzIGNhbiBydW4g YmVmb3JlIHRoZSBwb3BvdmVyIGlzIHJlbW92ZWQuCisKKyAgICAgICAgUmF0aGVyIHRoYW4gcmVs eSBvbiB0aGUgcHJlc2VuY2Ugb2YgdGhlIHBvcG92ZXIgaW4gdGhlIERPTSwgc2V0IGEgImRpc21p c3NpbmciCisgICAgICAgIGZsYWcgdGhlIGZpcnN0IHRpbWUgZGlzbWlzcyBpcyBjYWxsZWQsIGJl Zm9yZSB0aGUgZmFkZS1vdXQgYW5pbWF0aW9uIGJlZ2lucy4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvQnJlYWtwb2ludFBvcG92ZXJDb250cm9sbGVyLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRQb3BvdmVyQ29udHJvbGxlci5wcm90b3R5cGUuX2Nv bmRpdGlvbkNvZGVNaXJyb3JFc2NhcGVPckVudGVyS2V5KToKKyAgICAgICAgQ2hlY2sgZm9yIG51 bGwgcG9wb3Zlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Q b3BvdmVyLnByb3RvdHlwZS5kaXNtaXNzKToKKyAgICAgICAgRG8gbm90aGluZyBpZiBhbHJlYWR5 IGRpc21pc3NpbmcuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyLnByb3RvdHlwZS5o YW5kbGVFdmVudCk6CisgICAgICAgIFJlc2V0IGRpc21pc3NpbmcgZmxhZyBhZnRlciBzdHlsZSB0 cmFuc2l0aW9uIGNvbXBsZXRlcy4KKwogMjAxNi0wNC0wNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtl ckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogT3BlblJlc291cmNlRGlhbG9n IHNob3VsZCBrZWVwIGl0cyByZXNvdXJjZXMgbGlzdCB1cC10by1kYXRlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9CcmVha3BvaW50 UG9wb3ZlckNvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9CcmVha3BvaW50UG9wb3ZlckNvbnRyb2xsZXIuanMKaW5kZXggZDNiMjE4 NzgxNDViYWJjYzk5ODJjZGM5NmJjYzZhZThjNTExMzE2YS4uMWYwY2IwZmZjMGRhMzA3OGY4ZGQz MGYzZDU4ZmQ5NTMzNWFlNTZmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQnJlYWtwb2ludFBvcG92ZXJDb250cm9sbGVyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0JyZWFr cG9pbnRQb3BvdmVyQ29udHJvbGxlci5qcwpAQCAtMjQ2LDYgKzI0Niw5IEBAIFdlYkluc3BlY3Rv ci5CcmVha3BvaW50UG9wb3ZlckNvbnRyb2xsZXIgPSBjbGFzcyBCcmVha3BvaW50UG9wb3ZlckNv bnRyb2xsZXIgZXh0CiAKICAgICBfY29uZGl0aW9uQ29kZU1pcnJvckVzY2FwZU9yRW50ZXJLZXko KQogICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9wb3BvdmVyKQorICAgICAgICAgICAgcmV0dXJu OworCiAgICAgICAgIHRoaXMuX3BvcG92ZXIuZGlzbWlzcygpOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKaW5k ZXggZDNhMGQyMmRjOTRjYmE0OGRhNTA2ZTBhYWM3OGY2NTNlODZmMTFmZC4uODlhMTM2ZGU4NTIz YTVmYTY2OTBlNTlmNWE3MzIxZDIxNDQ1ZjUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCkBAIC0zOCw2ICszOCw3IEBA IFdlYkluc3BlY3Rvci5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdlYkluc3BlY3Rv ci5PYmplY3QKICAgICAgICAgdGhpcy5fcHJlZmVycmVkRWRnZXMgPSBudWxsOwogCiAgICAgICAg IHRoaXMuX2NvbnRlbnROZWVkc1VwZGF0ZSA9IGZhbHNlOworICAgICAgICB0aGlzLl9kaXNtaXNz aW5nID0gZmFsc2U7CiAKICAgICAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTmFtZSA9ICJwb3BvdmVy IjsKQEAgLTEzMiw5ICsxMzMsMTEgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIgPSBjbGFzcyBQb3Bv dmVyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgZGlzbWlzcygpCiAgICAgewot ICAgICAgICBpZiAodGhpcy5fZWxlbWVudC5wYXJlbnROb2RlICE9PSBkb2N1bWVudC5ib2R5KQor ICAgICAgICBpZiAodGhpcy5fZGlzbWlzc2luZyB8fCB0aGlzLl9lbGVtZW50LnBhcmVudE5vZGUg IT09IGRvY3VtZW50LmJvZHkpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5f ZGlzbWlzc2luZyA9IHRydWU7CisKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5faXNMaXN0 ZW5pbmdGb3JQb3BvdmVyRXZlbnRzKTsKICAgICAgICAgdGhpcy5faXNMaXN0ZW5pbmdGb3JQb3Bv dmVyRXZlbnRzID0gZmFsc2U7CiAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJt b3VzZWRvd24iLCB0aGlzLCB0cnVlKTsKQEAgLTE2MSw2ICsxNjQsOCBAQCBXZWJJbnNwZWN0b3Iu UG9wb3ZlciA9IGNsYXNzIFBvcG92ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAg ICAgICAgICAgICAgdGhpcy5fY29udGFpbmVyLnRleHRDb250ZW50ID0gIiI7CiAgICAgICAgICAg ICAgICAgaWYgKHRoaXMuZGVsZWdhdGUgJiYgdHlwZW9mIHRoaXMuZGVsZWdhdGUuZGlkRGlzbWlz c1BvcG92ZXIgPT09ICJmdW5jdGlvbiIpCiAgICAgICAgICAgICAgICAgICAgIHRoaXMuZGVsZWdh dGUuZGlkRGlzbWlzc1BvcG92ZXIodGhpcyk7CisKKyAgICAgICAgICAgICAgICB0aGlzLl9kaXNt aXNzaW5nID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0K