73900 2011-12-06 03:06:09 -0800 Web Inspector: [TextPrompt] Autocomplete improperly determines user input 2011-12-08 02:36:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 515769 0 apavlov 2011-12-06 03:06:09 -0800 The underlying cause is that a handler invoked as setTimeout(.., 0) from keydown handler gets run BEFORE the keypress and textInput events are dispatched, presumably due to some weird change in WebKit. Upstreaming http://code.google.com/p/chromium/issues/detail?id=106224 515772 1 118015 apavlov 2011-12-06 03:12:58 -0800 Created attachment 118015 Patch 515790 2 118015 yurys 2011-12-06 03:59:59 -0800 Comment on attachment 118015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118015&action=review > Source/WebCore/ChangeLog:5 > + Please describe the fix here. > Source/WebCore/inspector/front-end/TextPrompt.js:346 > + var immediately = this.isSuggestBoxVisible() || this._autocompleteRequestForced; Could you extract this code into a separate method and call it directly where you pass actuateNow=true. This way you could get rid of actuateNow parameter. 515799 3 118022 apavlov 2011-12-06 04:13:24 -0800 Created attachment 118022 [PATCH] Comments addressed 515818 4 apavlov 2011-12-06 04:55:15 -0800 A small investigation has shown that the sequence of keydown, keypress, textInput (a.k.a input) events is NOT dispatched synchronously. For one, in Chromium the "keydown" event arrives into Source/WebKit/chromium/src/WebViewImpl.cpp (handleInputEvent) as WebInputEvent::[Raw]KeyDown over IPC, while the "keypress" event arrives into the same method in a DIFFERENT IPC message as WebInputEvent::Char. Obviously, anything can happen between these two invocations of handleInputEvent(), including a triggering of a DOM timer (setTimeout). Hence, the correct solution seems to be the autocompletion of user input in the "input" event handler, which has been implemented in the suggested patch. 515826 5 118022 yurys 2011-12-06 05:16:38 -0800 Comment on attachment 118022 [PATCH] Comments addressed View in context: https://bugs.webkit.org/attachment.cgi?id=118022&action=review > Source/WebCore/inspector/front-end/TextPrompt.js:329 > + this._autocompleteRequestForced = force || false; Please rename _autocompleteRequestForced to something more appropriate that would reflect that it can have one of three states. > Source/WebCore/inspector/front-end/TextPrompt.js:330 > + return; Remove this line. 515831 6 apavlov 2011-12-06 05:20:50 -0800 (In reply to comment #5) > (From update of attachment 118022 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=118022&action=review > > > Source/WebCore/inspector/front-end/TextPrompt.js:329 > > + this._autocompleteRequestForced = force || false; > > Please rename _autocompleteRequestForced to something more appropriate that would reflect that it can have one of three states. Renamed to _autocompleteRequestState. > > Source/WebCore/inspector/front-end/TextPrompt.js:330 > > + return; > > Remove this line. Done. 517275 7 apavlov 2011-12-08 02:36:26 -0800 This issue has been determined to be a Chromium-specific regression, so the workaround patch should not be landed. 118015 2011-12-06 03:12:58 -0800 2011-12-06 04:13:16 -0800 Patch bug-73900-20111206151256.patch text/plain 4574 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JiZjM4ZWM0OTBkNDFi NzdlYjljYjIxMjFjNWIyMDBhNTFhN2Q2ZC4uYzYxMmM2YzRmMjEzMmZmNGRlYjk0NTIzYTMwOWQ4 NTFjNzI2MjQzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTEyLTA2ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1RleHRQcm9tcHRdIEF1dG9jb21wbGV0ZSBpbXByb3Blcmx5IGRldGVybWluZXMgdXNl ciBpbnB1dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzM5MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE cml2ZS1ieSBmaXggZm9yIGFkZGluZy9yZW1vdmluZyBib3VuZCAic2VsZWN0U3RhcnQiIGxpc3Rl bmVyLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBlLl9hdHRhY2hJbnRlcm5hbCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFByb21wdC5wcm90b3R5cGUuX3JlbW92ZUZyb21F bGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZS5fc2Vs ZWN0U3RhcnQubW92ZUJhY2tJZk91dHNpZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQ cm9tcHQucHJvdG90eXBlLl9zZWxlY3RTdGFydCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4 dFByb21wdC5wcm90b3R5cGUuYXV0b0NvbXBsZXRlU29vbik6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGV4dFByb21wdC5wcm90b3R5cGUuX29uSW5wdXQpOgorCiAyMDExLTEyLTA1ICBBbGV4YW5k ZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogW0F1ZGl0c10gSW1wbGVtZW50ICJTdG9wIiBidXR0b24gYW5kIHByb2dyZXNzIGJhciBpbnN0 ZWFkIG9mIHNwaW5uZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RleHRQcm9tcHQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RleHRQcm9tcHQuanMKaW5kZXggMDkxNjllMjljNzEwZGE1NzUxOTViMmZkNTlkODAyZmM2MjFk YzcwNy4uYTFhMzA5ZGEyNGJkOTYwZGE2MzhjNWJmM2Y1NzVhNjA3YjBlMWU4ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qcwpAQCAtMTA2 LDEzICsxMDYsMTUgQEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBlID0gewogCiAg ICAgICAgIHRoaXMuX2JvdW5kT25LZXlEb3duID0gdGhpcy5vbktleURvd24uYmluZCh0aGlzKTsK ICAgICAgICAgdGhpcy5fYm91bmRTZWxlY3RTdGFydCA9IHRoaXMuX3NlbGVjdFN0YXJ0LmJpbmQo dGhpcyk7CisgICAgICAgIHRoaXMuX2JvdW5kT25JbnB1dCA9IHRoaXMuX29uSW5wdXQuYmluZCh0 aGlzKTsKICAgICAgICAgdGhpcy5fcHJveHlFbGVtZW50ID0gZWxlbWVudC5vd25lckRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAgICAgICAgdGhpcy5fcHJveHlFbGVtZW50LnN0eWxl LmRpc3BsYXkgPSB0aGlzLl9wcm94eUVsZW1lbnREaXNwbGF5OwogICAgICAgICBlbGVtZW50LnBh cmVudEVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMucHJveHlFbGVtZW50LCBlbGVtZW50KTsKICAg ICAgICAgdGhpcy5wcm94eUVsZW1lbnQuYXBwZW5kQ2hpbGQoZWxlbWVudCk7CiAgICAgICAgIHRo aXMuX2VsZW1lbnQuYWRkU3R5bGVDbGFzcygidGV4dC1wcm9tcHQiKTsKICAgICAgICAgdGhpcy5f ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5fYm91bmRPbktleURvd24s IGZhbHNlKTsKLSAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzZWxlY3Rz dGFydCIsIHRoaXMuX3NlbGVjdFN0YXJ0LmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICAgICAgdGhp cy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzZWxlY3RzdGFydCIsIHRoaXMuX2JvdW5kU2Vs ZWN0U3RhcnQsIGZhbHNlKTsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJpbnB1dCIsIHRoaXMuX2JvdW5kT25JbnB1dCwgZmFsc2UpOwogCiAgICAgICAgIGlmICh0eXBl b2YgdGhpcy5fc3VnZ2VzdEJveENsYXNzTmFtZSA9PT0gInN0cmluZyIpCiAgICAgICAgICAgICB0 aGlzLl9zdWdnZXN0Qm94ID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LlN1Z2dlc3RCb3go dGhpcywgdGhpcy5fZWxlbWVudCwgdGhpcy5fc3VnZ2VzdEJveENsYXNzTmFtZSk7CkBAIC0xNTQs NiArMTU2LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLmNsZWFyQXV0b0NvbXBsZXRlKHRydWUpOwogICAgICAgICB0aGlzLl9lbGVtZW50LnJl bW92ZUV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9ib3VuZE9uS2V5RG93biwgZmFsc2Up OwogICAgICAgICB0aGlzLl9lbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNlbGVjdHN0YXJ0 IiwgdGhpcy5fYm91bmRTZWxlY3RTdGFydCwgZmFsc2UpOworICAgICAgICB0aGlzLl9lbGVtZW50 LnJlbW92ZUV2ZW50TGlzdGVuZXIoImlucHV0IiwgdGhpcy5fYm91bmRPbklucHV0LCBmYWxzZSk7 CiAgICAgICAgIGlmICh0aGlzLl9pc0VkaXRpbmcpCiAgICAgICAgICAgICB0aGlzLl9zdG9wRWRp dGluZygpOwogICAgICAgICBpZiAodGhpcy5fc3VnZ2VzdEJveCkKQEAgLTE5OCw3ICsyMDEsNyBA QCBXZWJJbnNwZWN0b3IuVGV4dFByb21wdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBkZWxl dGUgdGhpcy5fc2VsZWN0aW9uVGltZW91dDsKICAgICAgICAgICAgIGlmICghdGhpcy5pc0NhcmV0 SW5zaWRlUHJvbXB0KCkgJiYgd2luZG93LmdldFNlbGVjdGlvbigpLmlzQ29sbGFwc2VkKQogICAg ICAgICAgICAgICAgIHRoaXMubW92ZUNhcmV0VG9FbmRPZlByb21wdCgpOwotICAgICAgICAgICAg dGhpcy5hdXRvQ29tcGxldGVTb29uKCk7CisgICAgICAgICAgICB0aGlzLmF1dG9Db21wbGV0ZVNv b24oZmFsc2UsIHRydWUpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fc2VsZWN0aW9uVGlt ZW91dCA9IHNldFRpbWVvdXQobW92ZUJhY2tJZk91dHNpZGUuYmluZCh0aGlzKSwgMTAwKTsKQEAg LTMyMCwxMiArMzIzLDI5IEBAIFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsK IAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IGZvcmNlCisgICAgICogQHBhcmFt IHtib29sZWFuPX0gYWN0dWF0ZU5vdwogICAgICAqLwotICAgIGF1dG9Db21wbGV0ZVNvb246IGZ1 bmN0aW9uKGZvcmNlKQorICAgIGF1dG9Db21wbGV0ZVNvb246IGZ1bmN0aW9uKGZvcmNlLCBhY3R1 YXRlTm93KQogICAgIHsKLSAgICAgICAgdmFyIGltbWVkaWF0ZWx5ID0gdGhpcy5pc1N1Z2dlc3RC b3hWaXNpYmxlKCkgfHwgZm9yY2U7Ci0gICAgICAgIGlmICghdGhpcy5fY29tcGxldGVUaW1lb3V0 KQorICAgICAgICBpZiAoIWFjdHVhdGVOb3cpIHsKKyAgICAgICAgICAgIHRoaXMuX2F1dG9jb21w bGV0ZVJlcXVlc3RGb3JjZWQgPSBmb3JjZSB8fCBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCisgICAgICAgIGlmICghdGhpcy5fY29tcGxldGVUaW1lb3V0KSB7CisgICAg ICAgICAgICB2YXIgaW1tZWRpYXRlbHkgPSB0aGlzLmlzU3VnZ2VzdEJveFZpc2libGUoKSB8fCBm b3JjZTsKICAgICAgICAgICAgIHRoaXMuX2NvbXBsZXRlVGltZW91dCA9IHNldFRpbWVvdXQodGhp cy5jb21wbGV0ZS5iaW5kKHRoaXMsIHRydWUsIGZvcmNlKSwgaW1tZWRpYXRlbHkgPyAwIDogMjUw KTsKKyAgICAgICAgfQorICAgIH0sCisKKyAgICBfb25JbnB1dDogZnVuY3Rpb24oZXZlbnQpCisg ICAgeworICAgICAgICBpZiAodHlwZW9mIHRoaXMuX2F1dG9jb21wbGV0ZVJlcXVlc3RGb3JjZWQg PT09ICJ1bmRlZmluZWQiIHx8IHRoaXMuX2NvbXBsZXRlVGltZW91dCkKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICB2YXIgaW1tZWRpYXRlbHkgPSB0aGlzLmlzU3VnZ2VzdEJveFZpc2li bGUoKSB8fCB0aGlzLl9hdXRvY29tcGxldGVSZXF1ZXN0Rm9yY2VkOworICAgICAgICB0aGlzLl9j b21wbGV0ZVRpbWVvdXQgPSBzZXRUaW1lb3V0KHRoaXMuY29tcGxldGUuYmluZCh0aGlzLCB0cnVl LCB0aGlzLl9hdXRvY29tcGxldGVSZXF1ZXN0Rm9yY2VkKSwgaW1tZWRpYXRlbHkgPyAwIDogMjUw KTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2F1dG9jb21wbGV0ZVJlcXVlc3RGb3JjZWQ7CiAgICAg fSwKIAogICAgIC8qKgo= 118022 2011-12-06 04:13:24 -0800 2011-12-06 05:16:38 -0800 [PATCH] Comments addressed bug-73900-20111206161322.patch text/plain 4610 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JiZjM4ZWM0OTBkNDFi NzdlYjljYjIxMjFjNWIyMDBhNTFhN2Q2ZC4uNTI3MzY5MjM5Mzk2MTM2NTRhNmM3NDE0M2Y1NDll YmUwYjkwN2I5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTEyLTA2ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1RleHRQcm9tcHRdIEF1dG9jb21wbGV0ZSBpbXByb3Blcmx5IGRldGVybWluZXMgdXNl ciBpbnB1dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzM5MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGUgaXNzdWUgaXMgdGhhdCBmb3Igc29tZSByZWFzb24gdGhlIHNldFRpbWVvdXQoLi4sIDApIGNh bGxiYWNrIHNjaGVkdWxlZCBpbiBrZXlkb3duIGhhbmRsZXIgZmlyZXMKKyAgICAgICAgQkVGT1JF IHRoZSB0ZXh0SW5wdXQgZXZlbnQgaXMgZGlzcGF0Y2hlZCwgcmVzdWx0aW5nIGluIHRoZSBoYW5k bGluZyBvZiB1bmNoYW5nZWQgdXNlciBpbnB1dC4gVGhpcyBjaGFuZ2UKKyAgICAgICAgZGVsYXlz IHRoZSB1c2VyIGlucHV0IGhhbmRsaW5nIGFuZCBhdXRvY29tcGxldGlvbiB1bnRpbCB0aGUgdGV4 dElucHV0IGV2ZW50IGhhcyBiZWVuIGRpc3BhdGNoZWQuCisgICAgICAgIENvbnRhaW5zIGEgZHJp dmUtYnkgZml4IGZvciBhZGRpbmcvcmVtb3ZpbmcgYm91bmQgInNlbGVjdHN0YXJ0IiBsaXN0ZW5l ci4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZS5fYXR0YWNoSW50ZXJuYWwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBlLl9yZW1vdmVGcm9tRWxl bWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFByb21wdC5wcm90b3R5cGUuX3NlbGVj dFN0YXJ0Lm1vdmVCYWNrSWZPdXRzaWRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UHJv bXB0LnByb3RvdHlwZS5fc2VsZWN0U3RhcnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQ cm9tcHQucHJvdG90eXBlLmF1dG9Db21wbGV0ZVNvb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRleHRQcm9tcHQucHJvdG90eXBlLl9vbklucHV0KToKKwogMjAxMS0xMi0wNSAgQWxleGFuZGVy IFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtBdWRpdHNdIEltcGxlbWVudCAiU3RvcCIgYnV0dG9uIGFuZCBwcm9ncmVzcyBiYXIgaW5zdGVh ZCBvZiBzcGlubmVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UZXh0UHJvbXB0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U ZXh0UHJvbXB0LmpzCmluZGV4IDA5MTY5ZTI5YzcxMGRhNTc1MTk1YjJmZDU5ZDgwMmZjNjIxZGM3 MDcuLmExMjkxZTRiMGY1MTEyOTRmNTcwNTcyY2U5ZmRhYmY5MjU3N2M5ZTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMKQEAgLTEwNiwx MyArMTA2LDE1IEBAIFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsKIAogICAg ICAgICB0aGlzLl9ib3VuZE9uS2V5RG93biA9IHRoaXMub25LZXlEb3duLmJpbmQodGhpcyk7CiAg ICAgICAgIHRoaXMuX2JvdW5kU2VsZWN0U3RhcnQgPSB0aGlzLl9zZWxlY3RTdGFydC5iaW5kKHRo aXMpOworICAgICAgICB0aGlzLl9ib3VuZE9uSW5wdXQgPSB0aGlzLl9vbklucHV0LmJpbmQodGhp cyk7CiAgICAgICAgIHRoaXMuX3Byb3h5RWxlbWVudCA9IGVsZW1lbnQub3duZXJEb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgIHRoaXMuX3Byb3h5RWxlbWVudC5zdHlsZS5k aXNwbGF5ID0gdGhpcy5fcHJveHlFbGVtZW50RGlzcGxheTsKICAgICAgICAgZWxlbWVudC5wYXJl bnRFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLnByb3h5RWxlbWVudCwgZWxlbWVudCk7CiAgICAg ICAgIHRoaXMucHJveHlFbGVtZW50LmFwcGVuZENoaWxkKGVsZW1lbnQpOwogICAgICAgICB0aGlz Ll9lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInRleHQtcHJvbXB0Iik7CiAgICAgICAgIHRoaXMuX2Vs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX2JvdW5kT25LZXlEb3duLCBm YWxzZSk7Ci0gICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2VsZWN0c3Rh cnQiLCB0aGlzLl9zZWxlY3RTdGFydC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgICAgIHRoaXMu X2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2VsZWN0c3RhcnQiLCB0aGlzLl9ib3VuZFNlbGVj dFN0YXJ0LCBmYWxzZSk7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi aW5wdXQiLCB0aGlzLl9ib3VuZE9uSW5wdXQsIGZhbHNlKTsKIAogICAgICAgICBpZiAodHlwZW9m IHRoaXMuX3N1Z2dlc3RCb3hDbGFzc05hbWUgPT09ICJzdHJpbmciKQogICAgICAgICAgICAgdGhp cy5fc3VnZ2VzdEJveCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dFByb21wdC5TdWdnZXN0Qm94KHRo aXMsIHRoaXMuX2VsZW1lbnQsIHRoaXMuX3N1Z2dlc3RCb3hDbGFzc05hbWUpOwpAQCAtMTU0LDYg KzE1Niw3IEBAIFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5jbGVhckF1dG9Db21wbGV0ZSh0cnVlKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5yZW1v dmVFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5fYm91bmRPbktleURvd24sIGZhbHNlKTsK ICAgICAgICAgdGhpcy5fZWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJzZWxlY3RzdGFydCIs IHRoaXMuX2JvdW5kU2VsZWN0U3RhcnQsIGZhbHNlKTsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5y ZW1vdmVFdmVudExpc3RlbmVyKCJpbnB1dCIsIHRoaXMuX2JvdW5kT25JbnB1dCwgZmFsc2UpOwog ICAgICAgICBpZiAodGhpcy5faXNFZGl0aW5nKQogICAgICAgICAgICAgdGhpcy5fc3RvcEVkaXRp bmcoKTsKICAgICAgICAgaWYgKHRoaXMuX3N1Z2dlc3RCb3gpCkBAIC0xOTgsNyArMjAxLDcgQEAg V2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBlID0gewogICAgICAgICAgICAgZGVsZXRl IHRoaXMuX3NlbGVjdGlvblRpbWVvdXQ7CiAgICAgICAgICAgICBpZiAoIXRoaXMuaXNDYXJldElu c2lkZVByb21wdCgpICYmIHdpbmRvdy5nZXRTZWxlY3Rpb24oKS5pc0NvbGxhcHNlZCkKICAgICAg ICAgICAgICAgICB0aGlzLm1vdmVDYXJldFRvRW5kT2ZQcm9tcHQoKTsKLSAgICAgICAgICAgIHRo aXMuYXV0b0NvbXBsZXRlU29vbigpOworICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVBdXRvQ29t cGxldGUoKTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3NlbGVjdGlvblRpbWVvdXQgPSBz ZXRUaW1lb3V0KG1vdmVCYWNrSWZPdXRzaWRlLmJpbmQodGhpcyksIDEwMCk7CkBAIC0zMjMsOSAr MzI2LDI1IEBAIFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBhdXRvQ29tcGxldGVTb29uOiBmdW5jdGlvbihmb3JjZSkKICAgICB7Ci0gICAgICAgIHZh ciBpbW1lZGlhdGVseSA9IHRoaXMuaXNTdWdnZXN0Qm94VmlzaWJsZSgpIHx8IGZvcmNlOwotICAg ICAgICBpZiAoIXRoaXMuX2NvbXBsZXRlVGltZW91dCkKKyAgICAgICAgdGhpcy5fYXV0b2NvbXBs ZXRlUmVxdWVzdEZvcmNlZCA9IGZvcmNlIHx8IGZhbHNlOworICAgICAgICByZXR1cm47CisgICAg fSwKKworICAgIF9vbklucHV0OiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIGlmICh0 eXBlb2YgdGhpcy5fYXV0b2NvbXBsZXRlUmVxdWVzdEZvcmNlZCA9PT0gInVuZGVmaW5lZCIpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2NoZWR1bGVBdXRvQ29tcGxldGUo dGhpcy5fYXV0b2NvbXBsZXRlUmVxdWVzdEZvcmNlZCk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9h dXRvY29tcGxldGVSZXF1ZXN0Rm9yY2VkOworICAgIH0sCisKKyAgICBfc2NoZWR1bGVBdXRvQ29t cGxldGU6IGZ1bmN0aW9uKGZvcmNlKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9jb21wbGV0 ZVRpbWVvdXQpIHsKKyAgICAgICAgICAgIHZhciBpbW1lZGlhdGVseSA9IHRoaXMuaXNTdWdnZXN0 Qm94VmlzaWJsZSgpIHx8IGZvcmNlOwogICAgICAgICAgICAgdGhpcy5fY29tcGxldGVUaW1lb3V0 ID0gc2V0VGltZW91dCh0aGlzLmNvbXBsZXRlLmJpbmQodGhpcywgdHJ1ZSwgZm9yY2UpLCBpbW1l ZGlhdGVseSA/IDAgOiAyNTApOworICAgICAgICB9CiAgICAgfSwKIAogICAgIC8qKgo=