160840 2016-08-12 22:29:50 -0700 Web Inspector: Entering ":n" in Open Resource Dialog, where n > number of lines, should jump to the last line 2016-10-31 16:20:02 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED EasyFix, GoodFirstBug, InRadar P2 Normal --- 1 nvasilyev hi bburg commit-queue hi joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1219855 0 nvasilyev 2016-08-12 22:29:50 -0700 Steps: 1. Open Inspector on this page. 2. Press Command-Shift-O 3. Type "global.js:99999999" Expected: global.js opens and focused on the last line. Actual: global.js opens and focuses on the previously focused line (or just scrolls to the top of the resource). Notes: This is how it works in Sublime Text and Chrome DevTools. 1219856 1 webkit-bug-importer 2016-08-12 22:30:15 -0700 <rdar://problem/27835331> 1221331 2 286440 hi 2016-08-18 22:59:09 -0700 Created attachment 286440 Patch 1221447 3 286440 joepeck 2016-08-19 13:09:09 -0700 Comment on attachment 286440 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286440&action=review > Source/WebInspectorUI/UserInterface/Views/TextEditor.js:435 > + let line = Number.constrain(position.lineNumber, 0, this._codeMirror.lineCount() - 1); > + let column = Number.constrain(position.columnNumber, 0, this._codeMirror.getLine(line).length - 1); > + > + let lineHandle = this._codeMirror.getLineHandle(line); > if (!lineHandle || !this._visible || this._initialStringNotSet || this._deferReveal) { How does this handle editors that haven't yet loaded content (initial string not set, defer reveal)? Is lineCount() zero, and so line would be -1, and lineHandle would not exist? On the surface this patch seems fine, but I worry that if "deferReveal" is true, we would have just lost the line number. The test scenario for this is click a link to reveal a position in a resource that will be automatically pretty printed. 1221625 4 286530 hi 2016-08-19 22:41:47 -0700 Created attachment 286530 Patch 1221645 5 286530 joepeck 2016-08-20 02:40:47 -0700 Comment on attachment 286530 Patch This feels right! I'll review more closely when at a computer. 1222007 6 286530 joepeck 2016-08-22 15:29:54 -0700 Comment on attachment 286530 Patch r=me, I like this much better. Thanks for addressing the comments. To be sure, did you test with a an auto-formatted resource? Let me know if you have questions. 1222116 7 286530 commit-queue 2016-08-22 22:14:18 -0700 Comment on attachment 286530 Patch Clearing flags on attachment: 286530 Committed r204755: <http://trac.webkit.org/changeset/204755> 1222117 8 commit-queue 2016-08-22 22:14:22 -0700 All reviewed patches have been landed. Closing bug. 1245839 9 nvasilyev 2016-10-28 15:48:54 -0700 This isn't working for me on Safari Technology Preview 16. 1245869 10 293245 hi 2016-10-28 16:48:20 -0700 Created attachment 293245 Patch 1246674 11 293245 commit-queue 2016-10-31 16:19:58 -0700 Comment on attachment 293245 Patch Clearing flags on attachment: 293245 Committed r208188: <http://trac.webkit.org/changeset/208188> 1246675 12 commit-queue 2016-10-31 16:20:02 -0700 All reviewed patches have been landed. Closing bug. 286440 2016-08-18 22:59:09 -0700 2016-08-19 22:41:44 -0700 Patch bug-160840-20160818225718.patch text/plain 2647 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDMzODg2ZjFjODBiOGIwN2IyMzkxMTZmY2EwNGRi NTBhYWUwYzgxNjkuLjg1Nzk0YTIyNGQ4NTVlMWY5MDcwYzgwMTkyNGM0NDExZjQxMWUzOWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA4LTE4ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEVudGVyaW5nICI6biIgaW4gT3BlbiBSZXNvdXJjZSBEaWFsb2csIHdoZXJlIG4gPiBu dW1iZXIgb2YgbGluZXMsIHNob3VsZCBqdW1wIHRvIHRoZSBsYXN0IGxpbmUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDg0MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9UZXh0RWRpdG9yLmpzOgorICAgICAgICAoVGV4dEVkaXRvci5wcm90b3R5cGUucmV2ZWFsUG9z aXRpb24pOgorICAgICAgICBMaW1pdCB0aGUgZ2l2ZW4gbGluZSBhbmQgY29sdW1uIHRvIHRoZSBt YXhpbXVtIG51bWJlciBvZiBsaW5lcyBhbmQgdGhlIGNvbHVtbiBjb3VudCBvbiB0aGUKKyAgICAg ICAgcmVzdWx0aW5nIGxpbmUuCisKIDIwMTYtMDgtMTcgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJA YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5ldHdvcmsgVGFiIHNob3VsZCBu b3QgbGF5b3V0IGlmIG5vdCB2aXNpYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qcwppbmRleCAyYzgwOTA0ZTI1MWIw MmVkMWNiNzNlZDA3ZGZjYzVhMWI0NzM0NjQ3Li5jOTY3MWMxYWFjODYzNGEwOTM3MGRjNDE2OTEy ZGFlMjI3NDZlYjNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMKQEAgLTQyOCwxMCArNDI4LDEzIEBAIFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yID0gY2xhc3MgVGV4dEVkaXRvciBleHRlbmRzIFdlYkluc3BlY3Rv ci5WaWV3CiAgICAgICAgIGlmICghKHBvc2l0aW9uIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNv dXJjZUNvZGVQb3NpdGlvbikpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIGxp bmVIYW5kbGUgPSB0aGlzLl9jb2RlTWlycm9yLmdldExpbmVIYW5kbGUocG9zaXRpb24ubGluZU51 bWJlcik7CisgICAgICAgIGxldCBsaW5lID0gTnVtYmVyLmNvbnN0cmFpbihwb3NpdGlvbi5saW5l TnVtYmVyLCAwLCB0aGlzLl9jb2RlTWlycm9yLmxpbmVDb3VudCgpIC0gMSk7CisgICAgICAgIGxl dCBjb2x1bW4gPSBOdW1iZXIuY29uc3RyYWluKHBvc2l0aW9uLmNvbHVtbk51bWJlciwgMCwgdGhp cy5fY29kZU1pcnJvci5nZXRMaW5lKGxpbmUpLmxlbmd0aCAtIDEpOworCisgICAgICAgIGxldCBs aW5lSGFuZGxlID0gdGhpcy5fY29kZU1pcnJvci5nZXRMaW5lSGFuZGxlKGxpbmUpOwogICAgICAg ICBpZiAoIWxpbmVIYW5kbGUgfHwgIXRoaXMuX3Zpc2libGUgfHwgdGhpcy5faW5pdGlhbFN0cmlu Z05vdFNldCB8fCB0aGlzLl9kZWZlclJldmVhbCkgewogICAgICAgICAgICAgLy8gSWYgd2UgY2Fu J3QgZ2V0IGEgbGluZSBoYW5kbGUgb3IgYXJlIG5vdCB2aXNpYmxlIHRoZW4gd2Ugd2FpdCB0byBk byB0aGUgcmV2ZWFsLgotICAgICAgICAgICAgdGhpcy5fcG9zaXRpb25Ub1JldmVhbCA9IHBvc2l0 aW9uOworICAgICAgICAgICAgdGhpcy5fcG9zaXRpb25Ub1JldmVhbCA9IG5ldyBXZWJJbnNwZWN0 b3IuU291cmNlQ29kZVBvc2l0aW9uKGxpbmUsIGNvbHVtbik7CiAgICAgICAgICAgICB0aGlzLl90 ZXh0UmFuZ2VUb1NlbGVjdCA9IHRleHRSYW5nZVRvU2VsZWN0OwogICAgICAgICAgICAgdGhpcy5f Zm9yY2VVbmZvcm1hdHRlZCA9IGZvcmNlVW5mb3JtYXR0ZWQ7CiAgICAgICAgICAgICByZXR1cm47 CkBAIC00NTIsNyArNDU1LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IgPSBjbGFzcyBUZXh0 RWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgfQogCiAgICAgICAgIGlm ICghdGV4dFJhbmdlVG9TZWxlY3QpCi0gICAgICAgICAgICB0ZXh0UmFuZ2VUb1NlbGVjdCA9IG5l dyBXZWJJbnNwZWN0b3IuVGV4dFJhbmdlKHBvc2l0aW9uLmxpbmVOdW1iZXIsIHBvc2l0aW9uLmNv bHVtbk51bWJlciwgcG9zaXRpb24ubGluZU51bWJlciwgcG9zaXRpb24uY29sdW1uTnVtYmVyKTsK KyAgICAgICAgICAgIHRleHRSYW5nZVRvU2VsZWN0ID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0UmFu Z2UobGluZSwgY29sdW1uLCBsaW5lLCBjb2x1bW4pOwogCiAgICAgICAgIGZ1bmN0aW9uIHJlbW92 ZVN0eWxlQ2xhc3MoKQogICAgICAgICB7Cg== 286530 2016-08-19 22:41:47 -0700 2016-10-28 16:48:17 -0700 Patch bug-160840-20160819223956.patch text/plain 2615 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDMzODg2ZjFjODBiOGIwN2IyMzkxMTZmY2EwNGRi NTBhYWUwYzgxNjkuLjY3MmE5OTE0YmJmY2FkZWY3YWY3ZmJiYzZmMmYyZDQyZmVkYTlkZGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA4LTE5ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEVudGVyaW5nICI6biIgaW4gT3BlbiBSZXNvdXJjZSBEaWFsb2csIHdoZXJlIG4gPiBu dW1iZXIgb2YgbGluZXMsIHNob3VsZCBqdW1wIHRvIHRoZSBsYXN0IGxpbmUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDg0MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9UZXh0RWRpdG9yLmpzOgorICAgICAgICAoVGV4dEVkaXRvci5wcm90b3R5cGUucmV2ZWFsUG9z aXRpb24pOgorICAgICAgICBMaW1pdCB0aGUgZ2l2ZW4gbGluZSBhbmQgY29sdW1uIHRvIHRoZSBt YXhpbXVtIG51bWJlciBvZiBsaW5lcyBhbmQgdGhlIGNvbHVtbiBjb3VudCBvbiB0aGUKKyAgICAg ICAgcmVzdWx0aW5nIGxpbmUuCisKIDIwMTYtMDgtMTcgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJA YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5ldHdvcmsgVGFiIHNob3VsZCBu b3QgbGF5b3V0IGlmIG5vdCB2aXNpYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qcwppbmRleCAyYzgwOTA0ZTI1MWIw MmVkMWNiNzNlZDA3ZGZjYzVhMWI0NzM0NjQ3Li43MmExNTIwNzI1ZmUwYTZhYjZjYThjN2M0YjNi ZTNmN2Y0ZGVjODJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMKQEAgLTQyOCw3ICs0MjgsNyBAQCBXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvciA9IGNsYXNzIFRleHRFZGl0b3IgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu VmlldwogICAgICAgICBpZiAoIShwb3NpdGlvbiBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3Vy Y2VDb2RlUG9zaXRpb24pKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBsaW5l SGFuZGxlID0gdGhpcy5fY29kZU1pcnJvci5nZXRMaW5lSGFuZGxlKHBvc2l0aW9uLmxpbmVOdW1i ZXIpOworICAgICAgICBsZXQgbGluZUhhbmRsZSA9IHRoaXMuX2NvZGVNaXJyb3IuZ2V0TGluZUhh bmRsZShwb3NpdGlvbi5saW5lTnVtYmVyKTsKICAgICAgICAgaWYgKCFsaW5lSGFuZGxlIHx8ICF0 aGlzLl92aXNpYmxlIHx8IHRoaXMuX2luaXRpYWxTdHJpbmdOb3RTZXQgfHwgdGhpcy5fZGVmZXJS ZXZlYWwpIHsKICAgICAgICAgICAgIC8vIElmIHdlIGNhbid0IGdldCBhIGxpbmUgaGFuZGxlIG9y IGFyZSBub3QgdmlzaWJsZSB0aGVuIHdlIHdhaXQgdG8gZG8gdGhlIHJldmVhbC4KICAgICAgICAg ICAgIHRoaXMuX3Bvc2l0aW9uVG9SZXZlYWwgPSBwb3NpdGlvbjsKQEAgLTQ1MSw4ICs0NTEsMTQg QEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IgPSBjbGFzcyBUZXh0RWRpdG9yIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLlZpZXcKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAg IGlmICghdGV4dFJhbmdlVG9TZWxlY3QpCi0gICAgICAgICAgICB0ZXh0UmFuZ2VUb1NlbGVjdCA9 IG5ldyBXZWJJbnNwZWN0b3IuVGV4dFJhbmdlKHBvc2l0aW9uLmxpbmVOdW1iZXIsIHBvc2l0aW9u LmNvbHVtbk51bWJlciwgcG9zaXRpb24ubGluZU51bWJlciwgcG9zaXRpb24uY29sdW1uTnVtYmVy KTsKKyAgICAgICAgbGV0IGxpbmUgPSBOdW1iZXIuY29uc3RyYWluKHBvc2l0aW9uLmxpbmVOdW1i ZXIsIDAsIHRoaXMuX2NvZGVNaXJyb3IubGluZUNvdW50KCkgLSAxKTsKKyAgICAgICAgaWYgKGxp bmUgIT09IHBvc2l0aW9uLmxpbmVOdW1iZXIpCisgICAgICAgICAgICBsaW5lSGFuZGxlID0gdGhp cy5fY29kZU1pcnJvci5nZXRMaW5lSGFuZGxlKGxpbmUpOworCisgICAgICAgIGlmICghdGV4dFJh bmdlVG9TZWxlY3QpIHsKKyAgICAgICAgICAgIGxldCBjb2x1bW4gPSBOdW1iZXIuY29uc3RyYWlu KHBvc2l0aW9uLmNvbHVtbk51bWJlciwgMCwgdGhpcy5fY29kZU1pcnJvci5nZXRMaW5lKGxpbmUp Lmxlbmd0aCAtIDEpOworICAgICAgICAgICAgdGV4dFJhbmdlVG9TZWxlY3QgPSBuZXcgV2ViSW5z cGVjdG9yLlRleHRSYW5nZShsaW5lLCBjb2x1bW4sIGxpbmUsIGNvbHVtbik7CisgICAgICAgIH0K IAogICAgICAgICBmdW5jdGlvbiByZW1vdmVTdHlsZUNsYXNzKCkKICAgICAgICAgewo= 293245 2016-10-28 16:48:20 -0700 2016-10-31 16:19:58 -0700 Patch bug-160840-20161028164429.patch text/plain 2508 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdlMWRlNzJlMTA5NWU4YTJiNzVhZTIzM2ZhM2Ew YjI2NTM1NzVlNWEuLmQxYjJmYzdmMzJkMzcwNWViZGJhNmJhOWVmOTFlNzcyZjk0ZTA0ZmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE2LTEwLTI4ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEVudGVyaW5nICI6biIgaW4gT3BlbiBSZXNvdXJjZSBEaWFsb2csIHdoZXJlIG4gPiBu dW1iZXIgb2YgbGluZXMsIHNob3VsZCBqdW1wIHRvIHRoZSBsYXN0IGxpbmUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDg0MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9UZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90 eXBlLnJldmVhbFBvc2l0aW9uKToKKyAgICAgICAgU2luY2UgaXQgaXMgcG9zc2libGUgZm9yIHRo ZSBnaXZlbiBwb3NpdGlvbiB0byBiZSBvdXRzaWRlIHRoZSBib3VuZHMgb2YgdGhlIENvZGVNaXJy b3IKKyAgICAgICAgaW5zdGFuY2UsIHdhaXQgdG8gZ2V0IHRoZSBsaW5lIGhhbmRsZXIgZm9yIHRo ZSBoaWdobGlnaHQgYW5pbWF0aW9uIHVudGlsIHdlIGhhdmUgY29uc3RyYWluZWQKKyAgICAgICAg dGhlIHBvc2l0aW9uIHZhbHVlLgorCiAyMDE2LTEwLTI3ICBEZXZpbiBSb3Vzc28gIDxkY3JvdXNz byt3ZWJraXRAZ21haWwuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENyZWF0ZSBnZW5l cmFsIG1vZGVsIG9iamVjdCBDb2xsZWN0aW9uIGNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qcwppbmRleCA1MWQx Y2YzNTllNTIzMWQ2ZDIxYTM3MmYyZWRiNmJiMjE5YjVhMDJhLi4yZjZhNGZiYzg3MTJjZTBjYjQ2 NGM4NzE0MjRlYWY0YjUyZGU3ZDc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMKQEAgLTQ1MCw4ICs0NTAsNyBA QCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvciA9IGNsYXNzIFRleHRFZGl0b3IgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVmlldwogICAgICAgICBpZiAoIShwb3NpdGlvbiBpbnN0YW5jZW9mIFdlYkluc3Bl Y3Rvci5Tb3VyY2VDb2RlUG9zaXRpb24pKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAg IGxldCBsaW5lSGFuZGxlID0gdGhpcy5fY29kZU1pcnJvci5nZXRMaW5lSGFuZGxlKHBvc2l0aW9u LmxpbmVOdW1iZXIpOwotICAgICAgICBpZiAoIWxpbmVIYW5kbGUgfHwgIXRoaXMuX3Zpc2libGUg fHwgdGhpcy5faW5pdGlhbFN0cmluZ05vdFNldCB8fCB0aGlzLl9kZWZlclJldmVhbCkgeworICAg ICAgICBpZiAoIXRoaXMuX3Zpc2libGUgfHwgdGhpcy5faW5pdGlhbFN0cmluZ05vdFNldCB8fCB0 aGlzLl9kZWZlclJldmVhbCkgewogICAgICAgICAgICAgLy8gSWYgd2UgY2FuJ3QgZ2V0IGEgbGlu ZSBoYW5kbGUgb3IgYXJlIG5vdCB2aXNpYmxlIHRoZW4gd2Ugd2FpdCB0byBkbyB0aGUgcmV2ZWFs LgogICAgICAgICAgICAgdGhpcy5fcG9zaXRpb25Ub1JldmVhbCA9IHBvc2l0aW9uOwogICAgICAg ICAgICAgdGhpcy5fdGV4dFJhbmdlVG9TZWxlY3QgPSB0ZXh0UmFuZ2VUb1NlbGVjdDsKQEAgLTQ3 NCw4ICs0NzMsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvciA9IGNsYXNzIFRleHRFZGl0b3Ig ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB9CiAKICAgICAgICAgbGV0IGxpbmUg PSBOdW1iZXIuY29uc3RyYWluKHBvc2l0aW9uLmxpbmVOdW1iZXIsIDAsIHRoaXMuX2NvZGVNaXJy b3IubGluZUNvdW50KCkgLSAxKTsKLSAgICAgICAgaWYgKGxpbmUgIT09IHBvc2l0aW9uLmxpbmVO dW1iZXIpCi0gICAgICAgICAgICBsaW5lSGFuZGxlID0gdGhpcy5fY29kZU1pcnJvci5nZXRMaW5l SGFuZGxlKGxpbmUpOworICAgICAgICBsZXQgbGluZUhhbmRsZSA9IHRoaXMuX2NvZGVNaXJyb3Iu Z2V0TGluZUhhbmRsZShsaW5lKTsKIAogICAgICAgICBpZiAoIXRleHRSYW5nZVRvU2VsZWN0KSB7 CiAgICAgICAgICAgICBsZXQgY29sdW1uID0gTnVtYmVyLmNvbnN0cmFpbihwb3NpdGlvbi5jb2x1 bW5OdW1iZXIsIDAsIHRoaXMuX2NvZGVNaXJyb3IuZ2V0TGluZShsaW5lKS5sZW5ndGggLSAxKTsK