67610 2011-09-05 11:29:21 -0700 Web Inspector: disable popover when a mouse button is pressed 2011-09-07 08:09:32 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 462199 0 caseq 2011-09-05 11:29:21 -0700 We should not display popover when a mouse button is pressed, as this conflicts with text selection. We used to have use cases where popover was shown when a button is pressed -- this is now irrelevant for at least some of them, as the timeout for a popover is really small (100ms for network panel), others (timeline?) probably need the time reduced, having them display popover on mousedown would be inconsistent UX. This also disables popover in the edit mode of SourceFrame, as the expression highlight conflicts with the TextView implementation of editor. 462200 1 106347 caseq 2011-09-05 11:31:33 -0700 Created attachment 106347 patch 462221 2 106347 pfeldman 2011-09-05 12:28:10 -0700 Comment on attachment 106347 patch View in context: https://bugs.webkit.org/attachment.cgi?id=106347&action=review > Source/WebCore/inspector/front-end/Popover.js:205 > + this._mouseButtonsState &= ~(1 << event.button); I am still parsing it... What is happening? > Source/WebCore/inspector/front-end/Popover.js:-227 > - _handleMouseAction: function(event, isMouseDown) I'd say we should keep Timeline's logic of immediately showing popover on click and not reduce its timeout. 462477 3 106409 caseq 2011-09-06 06:04:39 -0700 Created attachment 106409 patch - use event.which - retain popup by click by default 462709 4 106409 pfeldman 2011-09-06 11:54:50 -0700 Comment on attachment 106409 patch View in context: https://bugs.webkit.org/attachment.cgi?id=106409&action=review Looks good with a couple of nits. > Source/WebCore/inspector/front-end/SourceFrame.js:724 > + if (!this._textViewer.readOnly) { Do you need this? Will this method be called in case editing starts? > Source/WebCore/inspector/front-end/SourceFrame.js:827 > + if (this._popoverHelper) This should probably go into _setReadOnly. 463308 5 caseq 2011-09-07 05:19:19 -0700 (In reply to comment #4) > (From update of attachment 106409 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=106409&action=review > > Looks good with a couple of nits. > > > Source/WebCore/inspector/front-end/SourceFrame.js:724 > > + if (!this._textViewer.readOnly) { > > Do you need this? Will this method be called in case editing starts? Yes, this is actually the only place where we check that we're in edit mode (the one in doubleClick()/_setReadOnly() is only meant to protect from a race condition while the experssion is being evaluated). We could have made a check in shouldShowPopover(), but this would still leave a potential race condition if we introduce other methods to switch to the edit mode (keyboard shortcut?). > > > Source/WebCore/inspector/front-end/SourceFrame.js:827 > > + if (this._popoverHelper) > > This should probably go into _setReadOnly. Done. 463351 6 caseq 2011-09-07 08:09:32 -0700 Manually committed r94665: http://trac.webkit.org/changeset/94665 106347 2011-09-05 11:31:33 -0700 2011-09-06 06:04:39 -0700 patch popup-mouse.diff text/plain 4596 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ZWNiM2U4Li45YzcwNTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDktMDUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBkaXNhYmxlIHBvcG92ZXIgd2hlbiBhIG1vdXNlIGJ1dHRv biBpcyBwcmVzc2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NzYxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIC0gZGlzYWJsZSBwb3BvdmVyIHdoZW4gYSBtb3VzZSBidXR0b24gaXMgcHJlc3NlZAorICAg ICAgICAtIGRpc2FibGUgcG9wb3ZlciBpbiBhIFNvdXJjZUZyYW1lIHdoZW4gdGhlIHNvdXJjZSBp cyBiZWluZyBlZGl0ZWQKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qb3BvdmVySGVscGVyLnByb3RvdHlwZS5fbW91c2VVcCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUuX21vdXNlRG93bik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUuX2hhbmRsZU1vdXNlQWN0aW9uKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fb25IaWRlUG9wb3Zlcik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmRvdWJsZUNsaWNrKToKKwog MjAxMS0wOS0wNSAgS2F1c3R1YmggQXRyYXdhbGthciAgPGthdXN0dWJoQG1vdG9yb2xhLmNvbT4K IAogICAgICAgICBMb2dpYyBmcm9tIEhUTUxFbGVtZW50OjpkZXByZWNhdGVkQ3JlYXRlQ29udGV4 dHVhbEZyYWdtZW50IG1vdmVkIGludG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUG9wb3Zlci5qcwppbmRleCAwODA3M2IxLi5kZjc2Y2RjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzCkBAIC0xODcsNiArMTg3LDggQEAg V2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIgPSBmdW5jdGlvbihwYW5lbEVsZW1lbnQsIGdldEFu Y2hvciwgc2hvd1BvcG92ZXIsIG9uSGkKICAgICB0aGlzLl9nZXRBbmNob3IgPSBnZXRBbmNob3I7 CiAgICAgdGhpcy5fc2hvd1BvcG92ZXIgPSBzaG93UG9wb3ZlcjsKICAgICB0aGlzLl9vbkhpZGUg PSBvbkhpZGU7CisgICAgdGhpcy5fbW91c2VCdXR0b25zU3RhdGUgPSAwOworICAgIHBhbmVsRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZXVwIiwgdGhpcy5fbW91c2VVcC5iaW5kKHRoaXMp LCBmYWxzZSk7CiAgICAgcGFuZWxFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIs IHRoaXMuX21vdXNlRG93bi5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgcGFuZWxFbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoIm1vdXNlbW92ZSIsIHRoaXMuX21vdXNlTW92ZS5iaW5kKHRoaXMpLCBm YWxzZSk7CiAgICAgdGhpcy5zZXRUaW1lb3V0KDEwMDApOwpAQCAtMTk4LDEwICsyMDAsMTYgQEAg V2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl90 aW1lb3V0ID0gdGltZW91dDsKICAgICB9LAogCisgICAgX21vdXNlVXA6IGZ1bmN0aW9uKGV2ZW50 KQorICAgIHsKKyAgICAgICAgdGhpcy5fbW91c2VCdXR0b25zU3RhdGUgJj0gfigxIDw8IGV2ZW50 LmJ1dHRvbik7CisgICAgfSwKKwogICAgIF9tb3VzZURvd246IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKLSAgICAgICAgdGhpcy5fa2lsbEhpZGVQb3BvdmVyVGltZXIoKTsKLSAgICAgICAgdGhpcy5f aGFuZGxlTW91c2VBY3Rpb24oZXZlbnQsIHRydWUpOworICAgICAgICB0aGlzLl9tb3VzZUJ1dHRv bnNTdGF0ZSB8PSAoMSA8PCBldmVudC5idXR0b24pOworICAgICAgICB0aGlzLmhpZGVQb3BvdmVy KCk7CisgICAgICAgIHRoaXMuX3Jlc2V0SG92ZXJUaW1lcigpOwogICAgIH0sCiAKICAgICBfbW91 c2VNb3ZlOiBmdW5jdGlvbihldmVudCkKQEAgLTIyNCwxNSArMjMyLDE2IEBAIFdlYkluc3BlY3Rv ci5Qb3BvdmVySGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5faGFuZGxlTW91c2VB Y3Rpb24oZXZlbnQpOwogICAgIH0sCiAKLSAgICBfaGFuZGxlTW91c2VBY3Rpb246IGZ1bmN0aW9u KGV2ZW50LCBpc01vdXNlRG93bikKKyAgICBfaGFuZGxlTW91c2VBY3Rpb246IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fcmVzZXRIb3ZlclRpbWVyKCk7Ci0KKyAgICAgICAg aWYgKHRoaXMuX21vdXNlQnV0dG9uc1N0YXRlKQorICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB0aGlzLl9ob3ZlckVsZW1lbnQgPSB0aGlzLl9nZXRBbmNob3IoZXZlbnQudGFyZ2V0KTsKICAg ICAgICAgaWYgKCF0aGlzLl9ob3ZlckVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgY29uc3QgdG9vbFRpcERlbGF5ID0gaXNNb3VzZURvd24gPyAwIDogKHRoaXMuX3BvcHVw ID8gdGhpcy5fdGltZW91dCAqIDAuNiA6IHRoaXMuX3RpbWVvdXQpOworICAgICAgICBjb25zdCB0 b29sVGlwRGVsYXkgPSB0aGlzLl9wb3B1cCA/IHRoaXMuX3RpbWVvdXQgKiAwLjYgOiB0aGlzLl90 aW1lb3V0OwogICAgICAgICB0aGlzLl9ob3ZlclRpbWVyID0gc2V0VGltZW91dCh0aGlzLl9tb3Vz ZUhvdmVyLmJpbmQodGhpcywgdGhpcy5faG92ZXJFbGVtZW50KSwgdG9vbFRpcERlbGF5KTsKICAg ICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VG cmFtZS5qcwppbmRleCBiYjMwNDVjLi42ZjMzYzYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAgLTY2Myw2ICs2NjMsOCBAQCBX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgLy8g UmVwbGFjZSBoaWdsaWdodCBlbGVtZW50IHdpdGggaXRzIGNvbnRlbnRzIGlucGxhY2UuCiAgICAg ICAgIHZhciBoaWdobGlnaHRFbGVtZW50ID0gdGhpcy5faGlnaGxpZ2h0RWxlbWVudDsKKyAgICAg ICAgaWYgKCFoaWdobGlnaHRFbGVtZW50KQorICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB2 YXIgcGFyZW50RWxlbWVudCA9IGhpZ2hsaWdodEVsZW1lbnQucGFyZW50RWxlbWVudDsKICAgICAg ICAgdmFyIGNoaWxkID0gaGlnaGxpZ2h0RWxlbWVudC5maXJzdENoaWxkOwogICAgICAgICB3aGls ZSAoY2hpbGQpIHsKQEAgLTY3MSw2ICs2NzMsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlID0gewogICAgICAgICAgICAgY2hpbGQgPSBuZXh0U2libGluZzsKICAgICAgICAg fQogICAgICAgICBwYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKGhpZ2hsaWdodEVsZW1lbnQpOwor ICAgICAgICBkZWxldGUgdGhpcy5faGlnaGxpZ2h0RWxlbWVudDsKICAgICAgICAgdGhpcy5fZGVs ZWdhdGUucmVsZWFzZUV2YWx1YXRpb25SZXN1bHQoKTsKICAgICB9LAogCkBAIC03MTgsNiArNzIx LDEwIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBfb25T aG93UG9wb3ZlcjogZnVuY3Rpb24oZWxlbWVudCwgcG9wb3ZlcikKICAgICB7CisgICAgICAgIGlm ICghdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSkgeworICAgICAgICAgICAgdGhpcy5fcG9wb3Zl ckhlbHBlci5oaWRlUG9wb3ZlcigpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAg ICAgICAgIHRoaXMuX2hpZ2hsaWdodEVsZW1lbnQgPSB0aGlzLl9oaWdobGlnaHRFeHByZXNzaW9u KGVsZW1lbnQpOwogCiAgICAgICAgIGZ1bmN0aW9uIHNob3dPYmplY3RQb3BvdmVyKHJlc3VsdCwg d2FzVGhyb3duKQpAQCAtODE3LDYgKzgyNCw4IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9jb21taXRFZGl0aW5nSW5Qcm9ncmVzcykK ICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBpZiAodGhpcy5fcG9wb3ZlckhlbHBlcikK KyAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92ZXIoKTsKICAgICAgICAg dGhpcy5fc2V0UmVhZE9ubHkoZmFsc2UpOwogICAgIH0sCiAK 106409 2011-09-06 06:04:39 -0700 2011-09-06 11:54:50 -0700 patch popup-mouse.diff text/plain 5114 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNjdhZGMwLi5hMmU1YWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDktMDUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBkaXNhYmxlIHBvcG92ZXIgd2hlbiBhIG1vdXNlIGJ1dHRv biBpcyBwcmVzc2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NzYxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIC0gZGlzYWJsZSBwb3BvdmVyIHdoZW4gYSBtb3VzZSBidXR0b24gaXMgcHJlc3NlZAorICAg ICAgICAtIGRpc2FibGUgcG9wb3ZlciBpbiBhIFNvdXJjZUZyYW1lIHdoZW4gdGhlIHNvdXJjZSBp cyBiZWluZyBlZGl0ZWQKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qb3BvdmVySGVscGVyLnByb3RvdHlwZS5fbW91c2VVcCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUuX21vdXNlRG93bik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUuX2hhbmRsZU1vdXNlQWN0aW9uKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fb25IaWRlUG9wb3Zlcik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmRvdWJsZUNsaWNrKToKKwog MjAxMS0wOS0wNiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3NDgwCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMKaW5kZXggMDgwNzNiMS4uMTIx Y2JlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3Bv dmVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5q cwpAQCAtMTgxLDEyICsxODEsMTMgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlID0g ewogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqLwotV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIg PSBmdW5jdGlvbihwYW5lbEVsZW1lbnQsIGdldEFuY2hvciwgc2hvd1BvcG92ZXIsIG9uSGlkZSkK K1dlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyID0gZnVuY3Rpb24ocGFuZWxFbGVtZW50LCBnZXRB bmNob3IsIHNob3dQb3BvdmVyLCBvbkhpZGUsIGRpc2FibGVPbkNsaWNrKQogewogICAgIHRoaXMu X3BhbmVsRWxlbWVudCA9IHBhbmVsRWxlbWVudDsKICAgICB0aGlzLl9nZXRBbmNob3IgPSBnZXRB bmNob3I7CiAgICAgdGhpcy5fc2hvd1BvcG92ZXIgPSBzaG93UG9wb3ZlcjsKICAgICB0aGlzLl9v bkhpZGUgPSBvbkhpZGU7CisgICAgdGhpcy5fZGlzYWJsZU9uQ2xpY2sgPSAhIWRpc2FibGVPbkNs aWNrOwogICAgIHBhbmVsRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlz Ll9tb3VzZURvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHBhbmVsRWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJtb3VzZW1vdmUiLCB0aGlzLl9tb3VzZU1vdmUuYmluZCh0aGlzKSwgZmFsc2Up OwogICAgIHRoaXMuc2V0VGltZW91dCgxMDAwKTsKQEAgLTIwMCw4ICsyMDEsMTIgQEAgV2ViSW5z cGVjdG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlID0gewogCiAgICAgX21vdXNlRG93bjogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9raWxsSGlkZVBvcG92ZXJUaW1lcigp OwotICAgICAgICB0aGlzLl9oYW5kbGVNb3VzZUFjdGlvbihldmVudCwgdHJ1ZSk7CisgICAgICAg IGlmICh0aGlzLl9kaXNhYmxlT25DbGljaykKKyAgICAgICAgICAgIHRoaXMuaGlkZVBvcG92ZXIo KTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICB0aGlzLl9raWxsSGlkZVBvcG92ZXJUaW1l cigpOworICAgICAgICAgICAgdGhpcy5faGFuZGxlTW91c2VBY3Rpb24oZXZlbnQsIHRydWUpOwor ICAgICAgICB9CiAgICAgfSwKIAogICAgIF9tb3VzZU1vdmU6IGZ1bmN0aW9uKGV2ZW50KQpAQCAt MjI3LDExICsyMzIsMTEgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlID0g ewogICAgIF9oYW5kbGVNb3VzZUFjdGlvbjogZnVuY3Rpb24oZXZlbnQsIGlzTW91c2VEb3duKQog ICAgIHsKICAgICAgICAgdGhpcy5fcmVzZXRIb3ZlclRpbWVyKCk7Ci0KKyAgICAgICAgaWYgKGV2 ZW50LndoaWNoICYmIHRoaXMuX2Rpc2FibGVPbkNsaWNrKQorICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB0aGlzLl9ob3ZlckVsZW1lbnQgPSB0aGlzLl9nZXRBbmNob3IoZXZlbnQudGFyZ2V0 KTsKICAgICAgICAgaWYgKCF0aGlzLl9ob3ZlckVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47 Ci0KICAgICAgICAgY29uc3QgdG9vbFRpcERlbGF5ID0gaXNNb3VzZURvd24gPyAwIDogKHRoaXMu X3BvcHVwID8gdGhpcy5fdGltZW91dCAqIDAuNiA6IHRoaXMuX3RpbWVvdXQpOwogICAgICAgICB0 aGlzLl9ob3ZlclRpbWVyID0gc2V0VGltZW91dCh0aGlzLl9tb3VzZUhvdmVyLmJpbmQodGhpcywg dGhpcy5faG92ZXJFbGVtZW50KSwgdG9vbFRpcERlbGF5KTsKICAgICB9LApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggYmIzMDQ1 Yy4uMDNjNDY4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZUZyYW1lLmpzCkBAIC0yODIsNyArMjgyLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl90ZXh0Vmlld2Vy LmVsZW1lbnQ7CiAgICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZS5kZWJ1Z2dpbmdTdXBwb3J0ZWQo KSkgewogICAgICAgICAgICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3Iu UG9wb3ZlckhlbHBlcihlbGVtZW50LAotICAgICAgICAgICAgICAgIHRoaXMuX2dldFBvcG92ZXJB bmNob3IuYmluZCh0aGlzKSwgdGhpcy5fb25TaG93UG9wb3Zlci5iaW5kKHRoaXMpLCB0aGlzLl9v bkhpZGVQb3BvdmVyLmJpbmQodGhpcykpOworICAgICAgICAgICAgICAgIHRoaXMuX2dldFBvcG92 ZXJBbmNob3IuYmluZCh0aGlzKSwgdGhpcy5fb25TaG93UG9wb3Zlci5iaW5kKHRoaXMpLCB0aGlz Ll9vbkhpZGVQb3BvdmVyLmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICAgICAgZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9tb3VzZURvd24uYmluZCh0aGlzKSwg dHJ1ZSk7CiAgICAgICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRo aXMuX3Njcm9sbC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICAgICAgfQpAQCAtNjYzLDYgKzY2Myw4 IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAg ICAvLyBSZXBsYWNlIGhpZ2xpZ2h0IGVsZW1lbnQgd2l0aCBpdHMgY29udGVudHMgaW5wbGFjZS4K ICAgICAgICAgdmFyIGhpZ2hsaWdodEVsZW1lbnQgPSB0aGlzLl9oaWdobGlnaHRFbGVtZW50Owor ICAgICAgICBpZiAoIWhpZ2hsaWdodEVsZW1lbnQpCisgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIHZhciBwYXJlbnRFbGVtZW50ID0gaGlnaGxpZ2h0RWxlbWVudC5wYXJlbnRFbGVtZW50Owog ICAgICAgICB2YXIgY2hpbGQgPSBoaWdobGlnaHRFbGVtZW50LmZpcnN0Q2hpbGQ7CiAgICAgICAg IHdoaWxlIChjaGlsZCkgewpAQCAtNjcxLDYgKzY3Myw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjaGlsZCA9IG5leHRTaWJsaW5nOwogICAg ICAgICB9CiAgICAgICAgIHBhcmVudEVsZW1lbnQucmVtb3ZlQ2hpbGQoaGlnaGxpZ2h0RWxlbWVu dCk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9oaWdobGlnaHRFbGVtZW50OwogICAgICAgICB0aGlz Ll9kZWxlZ2F0ZS5yZWxlYXNlRXZhbHVhdGlvblJlc3VsdCgpOwogICAgIH0sCiAKQEAgLTcxOCw2 ICs3MjEsMTAgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKIAogICAg IF9vblNob3dQb3BvdmVyOiBmdW5jdGlvbihlbGVtZW50LCBwb3BvdmVyKQogICAgIHsKKyAgICAg ICAgaWYgKCF0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KSB7CisgICAgICAgICAgICB0aGlzLl9w b3BvdmVySGVscGVyLmhpZGVQb3BvdmVyKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KICAgICAgICAgdGhpcy5faGlnaGxpZ2h0RWxlbWVudCA9IHRoaXMuX2hpZ2hsaWdodEV4cHJl c3Npb24oZWxlbWVudCk7CiAKICAgICAgICAgZnVuY3Rpb24gc2hvd09iamVjdFBvcG92ZXIocmVz dWx0LCB3YXNUaHJvd24pCkBAIC04MTcsNiArODI0LDggQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX2NvbW1pdEVkaXRpbmdJblByb2dy ZXNzKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIGlmICh0aGlzLl9wb3BvdmVySGVs cGVyKQorICAgICAgICAgICAgdGhpcy5fcG9wb3ZlckhlbHBlci5oaWRlUG9wb3ZlcigpOwogICAg ICAgICB0aGlzLl9zZXRSZWFkT25seShmYWxzZSk7CiAgICAgfSwKIAo=