57229 2011-03-28 06:18:28 -0700 Web Inspector: execution line is displayed incorrectly after source editing. 2011-03-31 04:31:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik yurys oldest_to_newest 374454 0 podivilov 2011-03-28 06:18:28 -0700 Web Inspector: execution line is displayed incorrectly after source editing. 1. Pause on a breakpoint 2. Edit source above the execution line 3. Editor execution line decoration is moved while gutter decoration is not. 375344 1 87331 aandrey 2011-03-29 08:04:12 -0700 Created attachment 87331 Patch 375376 2 87331 pfeldman 2011-03-29 08:37:54 -0700 Comment on attachment 87331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87331&action=review > Source/WebCore/inspector/front-end/SourceFrame.js:188 > + if (this._executionLineNumber !== undefined) { I often use typeof this._executionLineNumber === "number" in such cases 376152 3 87331 aandrey 2011-03-30 02:39:19 -0700 Comment on attachment 87331 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87331&action=review >> Source/WebCore/inspector/front-end/SourceFrame.js:188 >> + if (this._executionLineNumber !== undefined) { > > I often use typeof this._executionLineNumber === "number" in such cases done 376153 4 87489 aandrey 2011-03-30 02:42:52 -0700 Created attachment 87489 Patch 377051 5 87489 podivilov 2011-03-31 04:31:28 -0700 Comment on attachment 87489 Patch Clearing flags on attachment: 87489 Committed r82560: <http://trac.webkit.org/changeset/82560> 377052 6 podivilov 2011-03-31 04:31:37 -0700 All reviewed patches have been landed. Closing bug. 87331 2011-03-29 08:04:12 -0700 2011-03-30 02:42:46 -0700 Patch bug-57229-20110329190410.patch text/plain 4423 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODIyMDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5M2I5Y2M1YjY1NWU3NzJh YzJmOTRjNTVkNDI3NTgwZDc0NzllMGFmLi4yNGFlMzJmMTgxNjZmODQ1ZmY5NzgwY2JmYzFlMzEz ZDUxNTQwYmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMjkgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGV4ZWN1dGlvbiBsaW5lIGlz IGRpc3BsYXllZCBpbmNvcnJlY3RseSBhZnRlciBzb3VyY2UgZWRpdGluZy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MjI5CisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fZW5kRWRpdGluZyk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLmFkZERlY29yYXRpb24pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLnJlbW92ZURlY29yYXRpb24p OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLm1h a2VMaW5lQUNodW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZS5fcG9zaXRpb25Ub1NlbGVjdGlvbik6CisKIDIwMTEtMDMtMjggIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHI4MjE5OC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IGY1NTBjZWJhYjBiMDdlNTJiNjM3N2FhMmI2NjA0 NWVmOGU2ZDJhMDEuLjNhZDY1ZjJlM2Y3YWFlZWQ0NzMzODdiNjIyMzdlZjY5MTU4NzZjODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5q cwpAQCAtMTg0LDcgKzE4NCwyMiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBl ID0gewogCiAgICAgX2VuZEVkaXRpbmc6IGZ1bmN0aW9uKG9sZFJhbmdlLCBuZXdSYW5nZSkKICAg ICB7Ci0gICAgICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgdGhpcy4KKyAgICAgICAgLy8gQWRqdXN0 IGV4ZWN1dGlvbiBsaW5lIG51bWJlci4KKyAgICAgICAgaWYgKHRoaXMuX2V4ZWN1dGlvbkxpbmVO dW1iZXIgIT09IHVuZGVmaW5lZCkgeworICAgICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSB0aGlz Ll9leGVjdXRpb25MaW5lTnVtYmVyOworICAgICAgICAgICAgdmFyIHNoaWZ0T2Zmc2V0ID0gbGlu ZU51bWJlciA8PSBvbGRSYW5nZS5zdGFydExpbmUgPyAwIDogbmV3UmFuZ2UubGluZXNDb3VudCAt IG9sZFJhbmdlLmxpbmVzQ291bnQ7CisKKyAgICAgICAgICAgIC8vIFNwZWNpYWwgY2FzZSBvZiBl ZGl0aW5nIHRoZSBleGVjdXRpb24gbGluZSBpdHNlbGYuIFdlIHNob3VsZCBkZWNpZGUgd2hldGhl ciB0aGUgZXhlY3V0aW9uIGxpbmUgbnVtYmVyIHNob3VsZCBtb3ZlIGJlbG93IG9yIG5vdC4KKyAg ICAgICAgICAgIGlmIChsaW5lTnVtYmVyID09PSBvbGRSYW5nZS5zdGFydExpbmUgJiYgbGluZU51 bWJlciArIDEgPD0gbmV3UmFuZ2UuZW5kTGluZSAmJiB0aGlzLl90ZXh0TW9kZWwubGluZUxlbmd0 aChsaW5lTnVtYmVyKSA8IHRoaXMuX3RleHRNb2RlbC5saW5lTGVuZ3RoKGxpbmVOdW1iZXIgKyAx KSkKKyAgICAgICAgICAgICAgICBzaGlmdE9mZnNldCA9IDE7CisKKyAgICAgICAgICAgIHZhciBu ZXdFeGVjdXRpb25MaW5lTnVtYmVyID0gTWF0aC5tYXgoMCwgbGluZU51bWJlciArIHNoaWZ0T2Zm c2V0KTsKKyAgICAgICAgICAgIGlmIChvbGRSYW5nZS5zdGFydExpbmUgPCBsaW5lTnVtYmVyICYm IGxpbmVOdW1iZXIgPCBvbGRSYW5nZS5lbmRMaW5lKQorICAgICAgICAgICAgICAgIG5ld0V4ZWN1 dGlvbkxpbmVOdW1iZXIgPSBvbGRSYW5nZS5zdGFydExpbmU7CisKKyAgICAgICAgICAgIHRoaXMu Y2xlYXJFeGVjdXRpb25MaW5lKCk7CisgICAgICAgICAgICB0aGlzLnNldEV4ZWN1dGlvbkxpbmUo bmV3RXhlY3V0aW9uTGluZU51bWJlcik7CisgICAgICAgIH0KICAgICB9LAogCiAgICAgX2NyZWF0 ZVRleHRWaWV3ZXI6IGZ1bmN0aW9uKG1pbWVUeXBlLCBjb250ZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IDUyODI2MjU0NDRm N2NkNzc4ZjJlODU4MmY4OGQ4MTIxMmQ0ZmFmOTkuLjk0MTZjOTFlMWRjZTMzOTg3ODM2YmY3ODc2 NGQ5YzFlOGIyODcxZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGV4dFZpZXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RleHRWaWV3ZXIuanMKQEAgLTI1OSwxMiArMjU5LDE4IEBAIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGFkZERlY29yYXRpb246IGZ1 bmN0aW9uKGxpbmVOdW1iZXIsIGRlY29yYXRpb24pCiAgICAgeworICAgICAgICBpZiAobGluZU51 bWJlciA+PSB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3VudCkKKyAgICAgICAgICAgIHJldHVybjsK KwogICAgICAgICB2YXIgY2h1bmsgPSB0aGlzLm1ha2VMaW5lQUNodW5rKGxpbmVOdW1iZXIpOwog ICAgICAgICBjaHVuay5hZGREZWNvcmF0aW9uKGRlY29yYXRpb24pOwogICAgIH0sCiAKICAgICBy ZW1vdmVEZWNvcmF0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBkZWNvcmF0aW9uKQogICAgIHsK KyAgICAgICAgaWYgKGxpbmVOdW1iZXIgPj0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCisg ICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdmFyIGNodW5rID0gdGhpcy5tYWtlTGluZUFD aHVuayhsaW5lTnVtYmVyKTsKICAgICAgICAgY2h1bmsucmVtb3ZlRGVjb3JhdGlvbihkZWNvcmF0 aW9uKTsKICAgICB9LApAQCAtNzc1LDYgKzc4MSwxNCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NhY2hlZFJvd3MgPSBbXTsK ICAgICB9LAogCisgICAgbWFrZUxpbmVBQ2h1bms6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCisgICAg eworICAgICAgICB2YXIgc2VsZWN0aW9uID0gdGhpcy5fZ2V0U2VsZWN0aW9uKCk7CisgICAgICAg IHZhciBjaHVuayA9IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlw ZS5tYWtlTGluZUFDaHVuay5jYWxsKHRoaXMsIGxpbmVOdW1iZXIpOworICAgICAgICB0aGlzLl9y ZXN0b3JlU2VsZWN0aW9uKHNlbGVjdGlvbik7CisgICAgICAgIHJldHVybiBjaHVuazsKKyAgICB9 LAorCiAgICAgX2J1aWxkQ2h1bmtzOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50OyArK2kpCkBAIC0xMDQ3LDcg KzEwNjEsOCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgX3Bvc2l0aW9uVG9TZWxlY3Rpb246IGZ1bmN0aW9uKGxpbmUsIGNvbHVtbikKICAgICB7 CiAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuY2h1bmtGb3JMaW5lKGxpbmUpOwotICAgICAgICB2 YXIgbGluZVJvdyA9IGNodW5rLmdldEV4cGFuZGVkTGluZVJvdyhsaW5lKTsKKyAgICAgICAgLy8g T25lLWxpbmVkIGNvbGxhcHNlZCBjaHVua3MgbWF5IHN0aWxsIHN0YXkgaGlnaGxpZ2h0ZWQuCisg ICAgICAgIHZhciBsaW5lUm93ID0gY2h1bmsubGluZXNDb3VudCA9PT0gMSA/IGNodW5rLmVsZW1l bnQgOiBjaHVuay5nZXRFeHBhbmRlZExpbmVSb3cobGluZSk7CiAgICAgICAgIGlmIChsaW5lUm93 KQogICAgICAgICAgICAgdmFyIHJhbmdlQm91bmRhcnkgPSBsaW5lUm93LnJhbmdlQm91bmRhcnlG b3JPZmZzZXQoY29sdW1uKTsKICAgICAgICAgZWxzZSB7Cg== 87489 2011-03-30 02:42:52 -0700 2011-03-31 04:31:28 -0700 Patch bug-57229-20110330134249.patch text/plain 9196 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODI0MTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiNWRmYzAyMjg4MjlhMGEz ZjgyMWVjZDZjNWQyMzQzOGFhOTA2YzQwLi5jNTczMzJlMjI0ZWI0OTAyYjMxODYzZmVmMzBiYTRj Yzc2ZTFlNzgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDMtMzAgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGV4ZWN1dGlvbiBsaW5lIGlz IGRpc3BsYXllZCBpbmNvcnJlY3RseSBhZnRlciBzb3VyY2UgZWRpdGluZy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MjI5CisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fc2F2ZVZpZXdlclN0YXRlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX3Jlc3RvcmVWaWV3ZXJTdGF0ZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9zdGFydEVkaXRpbmcpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fZW5kRWRpdGluZyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9jcmVhdGVUZXh0 Vmlld2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuc2V0 RXhlY3V0aW9uTGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90 eXBlLl9oYW5kbGVTYXZlLmRpZEVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5faGFuZGxlU2F2ZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9oYW5kbGVSZXZlcnRFZGl0aW5nKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUuYWRkRGVjb3JhdGlvbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUucmVt b3ZlRGVjb3JhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5l bC5wcm90b3R5cGUubWFrZUxpbmVBQ2h1bmspOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9wb3NpdGlvblRvU2VsZWN0aW9uKToKKwogMjAxMS0w My0yOSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IDc0ODJmMzQzNjUwYmM0NzMwNzllOGYz NWNjN2M3MzRjMWQ0YTU1MzQuLjNhOWRjMGIyZTY3ZjBkZDYxODZiMTdmZTRiOTkyNDY4YmNhYmJi OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VG cmFtZS5qcwpAQCAtMTcxLDEwICsxNzEsMzcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9saW5lVG9IaWdobGlnaHQ7CiAg ICAgfSwKIAorICAgIF9zYXZlVmlld2VyU3RhdGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IHRoaXMuX3ZpZXdlclN0YXRlID0geworICAgICAgICAgICAgdGV4dE1vZGVsQ29udGVudDogdGhp cy5fdGV4dE1vZGVsLnRleHQsCisgICAgICAgICAgICBleGVjdXRpb25MaW5lTnVtYmVyOiB0aGlz Ll9leGVjdXRpb25MaW5lTnVtYmVyLAorICAgICAgICAgICAgbWVzc2FnZXM6IHRoaXMuX21lc3Nh Z2VzLAorICAgICAgICAgICAgZGlmZkxpbmVzOiB0aGlzLl9kaWZmTGluZXMKKyAgICAgICAgfTsK KyAgICB9LAorCisgICAgX3Jlc3RvcmVWaWV3ZXJTdGF0ZTogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgaWYgKCF0aGlzLl92aWV3ZXJTdGF0ZSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgdGhpcy5fdGV4dE1vZGVsLnNldFRleHQobnVsbCwgdGhpcy5fdmlld2VyU3RhdGUudGV4dE1v ZGVsQ29udGVudCk7CisKKyAgICAgICAgdGhpcy5fbWVzc2FnZXMgPSB0aGlzLl92aWV3ZXJTdGF0 ZS5tZXNzYWdlczsKKyAgICAgICAgdGhpcy5fZGlmZkxpbmVzID0gdGhpcy5fdmlld2VyU3RhdGUu ZGlmZkxpbmVzOworICAgICAgICB0aGlzLl9zZXRUZXh0Vmlld2VyRGVjb3JhdGlvbnMoKTsKKwor ICAgICAgICBpZiAodHlwZW9mIHRoaXMuX3ZpZXdlclN0YXRlLmV4ZWN1dGlvbkxpbmVOdW1iZXIg PT09ICJudW1iZXIiKSB7CisgICAgICAgICAgICB0aGlzLmNsZWFyRXhlY3V0aW9uTGluZSgpOwor ICAgICAgICAgICAgdGhpcy5zZXRFeGVjdXRpb25MaW5lKHRoaXMuX3ZpZXdlclN0YXRlLmV4ZWN1 dGlvbkxpbmVOdW1iZXIpOworICAgICAgICB9CisgICAgICAgIGRlbGV0ZSB0aGlzLl92aWV3ZXJT dGF0ZTsKKyAgICB9LAorCiAgICAgX3N0YXJ0RWRpdGluZzogZnVuY3Rpb24oKQogICAgIHsKLSAg ICAgICAgaWYgKHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudCA9PT0gdW5kZWZpbmVkKSB7 Ci0gICAgICAgICAgICB0aGlzLl9vcmlnaW5hbFRleHRNb2RlbENvbnRlbnQgPSB0aGlzLl90ZXh0 TW9kZWwudGV4dDsKKyAgICAgICAgaWYgKCF0aGlzLl92aWV3ZXJTdGF0ZSkgeworICAgICAgICAg ICAgdGhpcy5fc2F2ZVZpZXdlclN0YXRlKCk7CiAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5z ZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkKHRydWUpOwogICAgICAgICB9CiAKQEAgLTE4NCw3 ICsyMTEsMjIgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKIAogICAg IF9lbmRFZGl0aW5nOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCiAgICAgewotICAgICAg ICAvLyBGSVhNRTogSW1wbGVtZW50IHRoaXMuCisgICAgICAgIC8vIEFkanVzdCBleGVjdXRpb24g bGluZSBudW1iZXIuCisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fZXhlY3V0aW9uTGluZU51bWJl ciA9PT0gIm51bWJlciIpIHsKKyAgICAgICAgICAgIHZhciBsaW5lTnVtYmVyID0gdGhpcy5fZXhl Y3V0aW9uTGluZU51bWJlcjsKKyAgICAgICAgICAgIHZhciBzaGlmdE9mZnNldCA9IGxpbmVOdW1i ZXIgPD0gb2xkUmFuZ2Uuc3RhcnRMaW5lID8gMCA6IG5ld1JhbmdlLmxpbmVzQ291bnQgLSBvbGRS YW5nZS5saW5lc0NvdW50OworCisgICAgICAgICAgICAvLyBTcGVjaWFsIGNhc2Ugb2YgZWRpdGlu ZyB0aGUgZXhlY3V0aW9uIGxpbmUgaXRzZWxmLiBXZSBzaG91bGQgZGVjaWRlIHdoZXRoZXIgdGhl IGV4ZWN1dGlvbiBsaW5lIG51bWJlciBzaG91bGQgbW92ZSBiZWxvdyBvciBub3QuCisgICAgICAg ICAgICBpZiAobGluZU51bWJlciA9PT0gb2xkUmFuZ2Uuc3RhcnRMaW5lICYmIGxpbmVOdW1iZXIg KyAxIDw9IG5ld1JhbmdlLmVuZExpbmUgJiYgdGhpcy5fdGV4dE1vZGVsLmxpbmVMZW5ndGgobGlu ZU51bWJlcikgPCB0aGlzLl90ZXh0TW9kZWwubGluZUxlbmd0aChsaW5lTnVtYmVyICsgMSkpCisg ICAgICAgICAgICAgICAgc2hpZnRPZmZzZXQgPSAxOworCisgICAgICAgICAgICB2YXIgbmV3RXhl Y3V0aW9uTGluZU51bWJlciA9IE1hdGgubWF4KDAsIGxpbmVOdW1iZXIgKyBzaGlmdE9mZnNldCk7 CisgICAgICAgICAgICBpZiAob2xkUmFuZ2Uuc3RhcnRMaW5lIDwgbGluZU51bWJlciAmJiBsaW5l TnVtYmVyIDwgb2xkUmFuZ2UuZW5kTGluZSkKKyAgICAgICAgICAgICAgICBuZXdFeGVjdXRpb25M aW5lTnVtYmVyID0gb2xkUmFuZ2Uuc3RhcnRMaW5lOworCisgICAgICAgICAgICB0aGlzLmNsZWFy RXhlY3V0aW9uTGluZSgpOworICAgICAgICAgICAgdGhpcy5zZXRFeGVjdXRpb25MaW5lKG5ld0V4 ZWN1dGlvbkxpbmVOdW1iZXIsIHRydWUpOworICAgICAgICB9CiAgICAgfSwKIAogICAgIF9jcmVh dGVUZXh0Vmlld2VyOiBmdW5jdGlvbihtaW1lVHlwZSwgY29udGVudCkKQEAgLTIxNCw3ICsyNTYs NyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Ll90ZXh0Vmlld2VyLm1pbWVUeXBlID0gbWltZVR5cGU7CiAgICAgICAgIHRoaXMuX3NldFRleHRW aWV3ZXJEZWNvcmF0aW9ucygpOwogCi0gICAgICAgIGlmICgiX2V4ZWN1dGlvbkxpbmVOdW1iZXIi IGluIHRoaXMpCisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fZXhlY3V0aW9uTGluZU51bWJlciA9 PT0gIm51bWJlciIpCiAgICAgICAgICAgICB0aGlzLnNldEV4ZWN1dGlvbkxpbmUodGhpcy5fZXhl Y3V0aW9uTGluZU51bWJlcik7CiAKICAgICAgICAgaWYgKHRoaXMuX2xpbmVOdW1iZXJUb1JldmVh bCkgewpAQCAtMzY1LDEyICs0MDcsMTMgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKICAgICAgICAgbXNnLl9yZXNvdXJjZU1lc3NhZ2VSZXBlYXRDb3VudEVsZW1lbnQu dGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiAocmVwZWF0ZWQgJWQgdGltZXMp IiwgbXNnLnJlcGVhdENvdW50KTsKICAgICB9LAogCi0gICAgc2V0RXhlY3V0aW9uTGluZTogZnVu Y3Rpb24obGluZU51bWJlcikKKyAgICBzZXRFeGVjdXRpb25MaW5lOiBmdW5jdGlvbihsaW5lTnVt YmVyLCBza2lwUmV2ZWFsTGluZSkKICAgICB7CiAgICAgICAgIHRoaXMuX2V4ZWN1dGlvbkxpbmVO dW1iZXIgPSBsaW5lTnVtYmVyOwogICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikgewogICAg ICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIsICJ3ZWJr aXQtZXhlY3V0aW9uLWxpbmUiKTsKLSAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmV2ZWFs TGluZShsaW5lTnVtYmVyKTsKKyAgICAgICAgICAgIGlmICghc2tpcFJldmVhbExpbmUpCisgICAg ICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZXZlYWxMaW5lKGxpbmVOdW1iZXIpOwogICAg ICAgICB9CiAgICAgfSwKIApAQCAtODA3LDI0ICs4NTAsMjQgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX3RleHRWaWV3ZXIucmVhZE9u bHkgfHwgIXRoaXMuX2RlbGVnYXRlLmNhbkVkaXRTY3JpcHRTb3VyY2UoKSkKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgICAgICBpZiAodGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250 ZW50ID09PSB1bmRlZmluZWQpIHsKKyAgICAgICAgaWYgKCF0aGlzLl92aWV3ZXJTdGF0ZSkgewog ICAgICAgICAgICAgLy8gTm8gZWRpdGluZyB3YXMgYWN0dWFsbHkgZG9uZS4KICAgICAgICAgICAg IHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5fZGVs ZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZChmYWxzZSk7CiAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBvcmlnaW5hbFRleHRNb2RlbENv bnRlbnQgPSB0aGlzLl9vcmlnaW5hbFRleHRNb2RlbENvbnRlbnQ7CisgICAgICAgIHZhciBvcmln aW5hbFZpZXdlclN0YXRlID0gdGhpcy5fdmlld2VyU3RhdGU7CiAgICAgICAgIHZhciBuZXdTb3Vy Y2UgPSB0aGlzLl90ZXh0TW9kZWwudGV4dDsKIAotICAgICAgICBkZWxldGUgdGhpcy5fb3JpZ2lu YWxUZXh0TW9kZWxDb250ZW50OworICAgICAgICBkZWxldGUgdGhpcy5fdmlld2VyU3RhdGU7CiAg ICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkgPSB0cnVlOwogICAgICAgICB0aGlzLl9k ZWxlZ2F0ZS5zZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkKGZhbHNlKTsKIAogICAgICAgICBm dW5jdGlvbiBkaWRFZGl0U2NyaXB0U291cmNlKHN1Y2Nlc3MsIG5ld0JvZHlPckVycm9yTWVzc2Fn ZSkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFzdWNjZXNzICYmIHRoaXMuX29yaWdpbmFs VGV4dE1vZGVsQ29udGVudCA9PT0gdW5kZWZpbmVkICYmIHRoaXMuX3RleHRNb2RlbC50ZXh0ID09 PSBuZXdTb3VyY2UpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9vcmlnaW5hbFRleHRNb2RlbENv bnRlbnQgPSBvcmlnaW5hbFRleHRNb2RlbENvbnRlbnQ7CisgICAgICAgICAgICBpZiAoIXN1Y2Nl c3MgJiYgIXRoaXMuX3ZpZXdlclN0YXRlICYmIHRoaXMuX3RleHRNb2RlbC50ZXh0ID09PSBuZXdT b3VyY2UpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl92aWV3ZXJTdGF0ZSA9IG9yaWdpbmFsVmll d2VyU3RhdGU7CiAgICAgICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSA9IGZh bHNlOwogICAgICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZUlzQmVp bmdFZGl0ZWQodHJ1ZSk7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhuZXdCb2R5 T3JFcnJvck1lc3NhZ2UsIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwu RXJyb3IpOwpAQCAtODQwLDkgKzg4Myw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIGlmICh0aGlzLl9vcmlnaW5hbFRleHRNb2Rl bENvbnRlbnQgIT09IHVuZGVmaW5lZCkKLSAgICAgICAgICAgIHRoaXMuX3RleHRNb2RlbC5zZXRU ZXh0KG51bGwsIHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudCk7Ci0gICAgICAgIGRlbGV0 ZSB0aGlzLl9vcmlnaW5hbFRleHRNb2RlbENvbnRlbnQ7CisgICAgICAgIHRoaXMuX3Jlc3RvcmVW aWV3ZXJTdGF0ZSgpOwogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gdHJ1ZTsK ICAgICAgICAgdGhpcy5fZGVsZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZChmYWxz ZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IDQzYjM0ZjYzZGZlNjJhZjMxMjQwNzM0M2M2 NTYwNGM3MDdhYWE5ODEuLmNlYWVlOWY2YzlkODllMzY4NzAwNzIzN2E2OTI4NWMwYzVkZDYzNWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdl ci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIu anMKQEAgLTI1OSwxMiArMjU5LDE4IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBh bmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGFkZERlY29yYXRpb246IGZ1bmN0aW9uKGxpbmVOdW1i ZXIsIGRlY29yYXRpb24pCiAgICAgeworICAgICAgICBpZiAobGluZU51bWJlciA+PSB0aGlzLl90 ZXh0TW9kZWwubGluZXNDb3VudCkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICB2YXIg Y2h1bmsgPSB0aGlzLm1ha2VMaW5lQUNodW5rKGxpbmVOdW1iZXIpOwogICAgICAgICBjaHVuay5h ZGREZWNvcmF0aW9uKGRlY29yYXRpb24pOwogICAgIH0sCiAKICAgICByZW1vdmVEZWNvcmF0aW9u OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBkZWNvcmF0aW9uKQogICAgIHsKKyAgICAgICAgaWYgKGxp bmVOdW1iZXIgPj0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpCisgICAgICAgICAgICByZXR1 cm47CisKICAgICAgICAgdmFyIGNodW5rID0gdGhpcy5tYWtlTGluZUFDaHVuayhsaW5lTnVtYmVy KTsKICAgICAgICAgY2h1bmsucmVtb3ZlRGVjb3JhdGlvbihkZWNvcmF0aW9uKTsKICAgICB9LApA QCAtNzk5LDYgKzgwNSwxNCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NhY2hlZFJvd3MgPSBbXTsKICAgICB9LAogCisgICAg bWFrZUxpbmVBQ2h1bms6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCisgICAgeworICAgICAgICB2YXIg c2VsZWN0aW9uID0gdGhpcy5fZ2V0U2VsZWN0aW9uKCk7CisgICAgICAgIHZhciBjaHVuayA9IFdl Ykluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZS5tYWtlTGluZUFDaHVu ay5jYWxsKHRoaXMsIGxpbmVOdW1iZXIpOworICAgICAgICB0aGlzLl9yZXN0b3JlU2VsZWN0aW9u KHNlbGVjdGlvbik7CisgICAgICAgIHJldHVybiBjaHVuazsKKyAgICB9LAorCiAgICAgX2J1aWxk Q2h1bmtzOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRo aXMuX3RleHRNb2RlbC5saW5lc0NvdW50OyArK2kpCkBAIC0xMDg3LDcgKzExMDEsOCBAQCBXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX3Bvc2l0aW9u VG9TZWxlY3Rpb246IGZ1bmN0aW9uKGxpbmUsIGNvbHVtbikKICAgICB7CiAgICAgICAgIHZhciBj aHVuayA9IHRoaXMuY2h1bmtGb3JMaW5lKGxpbmUpOwotICAgICAgICB2YXIgbGluZVJvdyA9IGNo dW5rLmdldEV4cGFuZGVkTGluZVJvdyhsaW5lKTsKKyAgICAgICAgLy8gT25lLWxpbmVkIGNvbGxh cHNlZCBjaHVua3MgbWF5IHN0aWxsIHN0YXkgaGlnaGxpZ2h0ZWQuCisgICAgICAgIHZhciBsaW5l Um93ID0gY2h1bmsubGluZXNDb3VudCA9PT0gMSA/IGNodW5rLmVsZW1lbnQgOiBjaHVuay5nZXRF eHBhbmRlZExpbmVSb3cobGluZSk7CiAgICAgICAgIGlmIChsaW5lUm93KQogICAgICAgICAgICAg dmFyIHJhbmdlQm91bmRhcnkgPSBsaW5lUm93LnJhbmdlQm91bmRhcnlGb3JPZmZzZXQoY29sdW1u KTsKICAgICAgICAgZWxzZSB7Cg==