58025 2011-04-07 03:26:00 -0700 Web Inspector: Bugs in some corner cases in the text editor 2011-04-08 04:22:21 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 aandrey webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 381218 0 aandrey 2011-04-07 03:26:00 -0700 1) The very last _empty_ line would not be deleted if you hit a Backspace on it, or the selection text to be deleted is extended to the very bottom of the editor. 2) An odd corner case: delete all source code from the editor, hit backspace on the only empty line, then add a character. In this case the browser will insert a TEXT node instead of a DIV node for a lineRow. 381222 1 88605 aandrey 2011-04-07 03:31:50 -0700 Created attachment 88605 Patch 381295 2 88605 yurys 2011-04-07 06:49:10 -0700 Comment on attachment 88605 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88605&action=review > Source/WebCore/ChangeLog:7 > + ChangeLog entry should briefly explain the change, please don't leave it empty. > Source/WebCore/inspector/front-end/TextViewer.js:1145 > + for (var lineRow = element; lineRow; lineRow = lineRow.parentElement) { Why not use this loop exclusively without relying on the class name above? 381296 3 88605 yurys 2011-04-07 06:49:49 -0700 Comment on attachment 88605 Patch Also, please update copyright years in the files you edit. 381314 4 88605 aandrey 2011-04-07 07:14:16 -0700 Comment on attachment 88605 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88605&action=review >> Source/WebCore/ChangeLog:7 >> + > > ChangeLog entry should briefly explain the change, please don't leave it empty. done. >> Source/WebCore/inspector/front-end/TextViewer.js:1145 >> + for (var lineRow = element; lineRow; lineRow = lineRow.parentElement) { > > Why not use this loop exclusively without relying on the class name above? Because an element may not be attached to the this._container any more (e.g. after a DOMNodeRemoved event). The loop is to handle the odd case when the browser would insert a line-row without the "webkit-line-content" className right under the this._container. 381318 5 88629 aandrey 2011-04-07 07:17:38 -0700 Created attachment 88629 Patch 382140 6 88629 podivilov 2011-04-08 04:22:11 -0700 Comment on attachment 88629 Patch Clearing flags on attachment: 88629 Committed r83285: <http://trac.webkit.org/changeset/83285> 382141 7 podivilov 2011-04-08 04:22:21 -0700 All reviewed patches have been landed. Closing bug. 88605 2011-04-07 03:31:50 -0700 2011-04-07 07:17:25 -0700 Patch bug-58025-20110407143148.patch text/plain 4899 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODMxNTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkNjlmZDE5NjZjYTIyYWU5 NzNhN2JlYjllMjk1ZTZmODE0MDJhNjNiLi42NjEwYTQzNTg2ZGFkZDc0MDQxNWIzNWI1OTY2ZTJh ZDVkZDhmM2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMDcgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEJ1Z3MgaW4gc29tZSBjb3Ju ZXIgY2FzZXMgaW4gdGhlIHRleHQgZWRpdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01ODAyNQorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFu ZWwucHJvdG90eXBlLl9zZWxlY3Rpb25Ub1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fZW5jbG9zaW5nTGluZVJvd09yU2VsZik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX2hh bmRsZURPTVVwZGF0ZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFu ZWwucHJvdG90eXBlLl9hcHBseURvbVVwZGF0ZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9jb2xsZWN0TGluZXNGcm9tRGl2KToKKwogMjAx MS0wNC0wNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IGZmMDIxMTRkMTNkYTQ3ZTE3N2ExNTUyYjhhOGFmMzk5 MDY2YzdjMDguLjY0Yzk1NTc0YTUxN2FiODJlNDc0Zjg3NGY3YmE1YWM1ODNhNWI0NzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKQEAg LTEwODQsMTQgKzEwODQsMTQgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICBpZiAoY29udGFpbmVyID09PSB0aGlzLl9jb250YWluZXIgJiYg b2Zmc2V0ID09PSAxKQogICAgICAgICAgICAgcmV0dXJuIHsgbGluZTogdGhpcy5fdGV4dE1vZGVs LmxpbmVzQ291bnQgLSAxLCBjb2x1bW46IHRoaXMuX3RleHRNb2RlbC5saW5lTGVuZ3RoKHRoaXMu X3RleHRNb2RlbC5saW5lc0NvdW50IC0gMSkgfTsKIAotICAgICAgICB2YXIgbGluZVJvdyA9IGNv bnRhaW5lci5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aE5vZGVOYW1lKCJESVYiKTsKKyAgICAgICAg dmFyIGxpbmVSb3cgPSB0aGlzLl9lbmNsb3NpbmdMaW5lUm93T3JTZWxmKGNvbnRhaW5lcik7CiAg ICAgICAgIHZhciBsaW5lTnVtYmVyID0gbGluZVJvdy5saW5lTnVtYmVyOwogICAgICAgICBpZiAo Y29udGFpbmVyID09PSBsaW5lUm93ICYmIG9mZnNldCA9PT0gMCkKICAgICAgICAgICAgIHJldHVy biB7IGxpbmU6IGxpbmVOdW1iZXIsIGNvbHVtbjogMCB9OwogCiAgICAgICAgIC8vIFRoaXMgbWF5 IGJlIGNodW5rIGFuZCBjaHVua3MgbWF5IGNvbnRhaW4gXG4uCiAgICAgICAgIHZhciBjb2x1bW4g PSAwOwotICAgICAgICB2YXIgbm9kZSA9IGxpbmVSb3cudHJhdmVyc2VOZXh0VGV4dE5vZGUobGlu ZVJvdyk7CisgICAgICAgIHZhciBub2RlID0gbGluZVJvdy5ub2RlVHlwZSA9PT0gTm9kZS5URVhU X05PREUgPyBsaW5lUm93IDogbGluZVJvdy50cmF2ZXJzZU5leHRUZXh0Tm9kZShsaW5lUm93KTsK ICAgICAgICAgd2hpbGUgKG5vZGUgJiYgbm9kZSAhPT0gY29udGFpbmVyKSB7CiAgICAgICAgICAg ICB2YXIgdGV4dCA9IG5vZGUudGV4dENvbnRlbnQ7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IHRleHQubGVuZ3RoOyArK2kpIHsKQEAgLTExMzcsNiArMTEzNywxOCBAQCBXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBy YW5nZUJvdW5kYXJ5OwogICAgIH0sCiAKKyAgICBfZW5jbG9zaW5nTGluZVJvd09yU2VsZjogZnVu Y3Rpb24oZWxlbWVudCkKKyAgICB7CisgICAgICAgIHZhciBsaW5lUm93ID0gZWxlbWVudC5lbmNs b3NpbmdOb2RlT3JTZWxmV2l0aENsYXNzKCJ3ZWJraXQtbGluZS1jb250ZW50Iik7CisgICAgICAg IGlmIChsaW5lUm93KQorICAgICAgICAgICAgcmV0dXJuIGxpbmVSb3c7CisgICAgICAgIGZvciAo dmFyIGxpbmVSb3cgPSBlbGVtZW50OyBsaW5lUm93OyBsaW5lUm93ID0gbGluZVJvdy5wYXJlbnRF bGVtZW50KSB7CisgICAgICAgICAgICBpZiAobGluZVJvdy5wYXJlbnRFbGVtZW50ID09PSB0aGlz Ll9jb250YWluZXIpCisgICAgICAgICAgICAgICAgcmV0dXJuIGxpbmVSb3c7CisgICAgICAgIH0K KyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfSwKKwogICAgIF9hcHBlbmRTcGFuOiBmdW5jdGlv bihlbGVtZW50LCBjb250ZW50LCBjbGFzc05hbWUpCiAgICAgewogICAgICAgICBpZiAoY2xhc3NO YW1lID09PSAiaHRtbC1yZXNvdXJjZS1saW5rIiB8fCBjbGFzc05hbWUgPT09ICJodG1sLWV4dGVy bmFsLWxpbmsiKSB7CkBAIC0xMjAxLDcgKzEyMTMsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0YXJnZXQgPT09IHRoaXMuX2Nv bnRhaW5lcikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIgbGluZVJvdyA9IHRh cmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aENsYXNzKCJ3ZWJraXQtbGluZS1jb250ZW50Iik7 CisgICAgICAgIHZhciBsaW5lUm93ID0gdGhpcy5fZW5jbG9zaW5nTGluZVJvd09yU2VsZih0YXJn ZXQpOwogICAgICAgICBpZiAoIWxpbmVSb3cpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTEy MjksNyArMTI0MSw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlw ZSA9IHsKIAogICAgICAgICB2YXIgZW5kTGluZSA9IHN0YXJ0TGluZSArIDE7CiAgICAgICAgIGZv ciAodmFyIHJvdyA9IGxpbmVSb3cubmV4dFNpYmxpbmc7IHJvdzsgcm93ID0gcm93Lm5leHRTaWJs aW5nKSB7Ci0gICAgICAgICAgICBpZiAodHlwZW9mIHJvdy5saW5lTnVtYmVyID09PSAibnVtYmVy IikgeworICAgICAgICAgICAgaWYgKHR5cGVvZiByb3cubGluZU51bWJlciA9PT0gIm51bWJlciIg JiYgcm93LmxpbmVOdW1iZXIgPiBzdGFydExpbmUpIHsKICAgICAgICAgICAgICAgICBlbmRMaW5l ID0gcm93LmxpbmVOdW1iZXI7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9 CkBAIC0xMzE2LDYgKzEzMjgsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChsaW5lcy5sZW5ndGggPT09IDAgJiYgZW5kTGluZSA8 IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50KSB7CiAgICAgICAgICAgICB2YXIgb2xkUmFuZ2Ug PSBuZXcgV2ViSW5zcGVjdG9yLlRleHRSYW5nZShzdGFydExpbmUsIDAsIGVuZExpbmUsIDApOwog ICAgICAgICAgICAgdmFyIG5ld1JhbmdlID0gdGhpcy5fdGV4dE1vZGVsLnNldFRleHQob2xkUmFu Z2UsICIiKTsKKyAgICAgICAgfSBlbHNlIGlmIChsaW5lcy5sZW5ndGggPT09IDAgJiYgc3RhcnRM aW5lID4gMCkgeworICAgICAgICAgICAgdmFyIG9sZFJhbmdlID0gbmV3IFdlYkluc3BlY3Rvci5U ZXh0UmFuZ2Uoc3RhcnRMaW5lIC0gMSwgdGhpcy5fdGV4dE1vZGVsLmxpbmVMZW5ndGgoc3RhcnRM aW5lIC0gMSksIGVuZExpbmUgLSAxLCB0aGlzLl90ZXh0TW9kZWwubGluZUxlbmd0aChlbmRMaW5l IC0gMSkpOworICAgICAgICAgICAgdmFyIG5ld1JhbmdlID0gdGhpcy5fdGV4dE1vZGVsLnNldFRl eHQob2xkUmFuZ2UsICIiKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHZhciBvbGRS YW5nZSA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dFJhbmdlKHN0YXJ0TGluZSwgMCwgZW5kTGluZSAt IDEsIHRoaXMuX3RleHRNb2RlbC5saW5lTGVuZ3RoKGVuZExpbmUgLSAxKSk7CiAgICAgICAgICAg ICB2YXIgbmV3UmFuZ2UgPSB0aGlzLl90ZXh0TW9kZWwuc2V0VGV4dChvbGRSYW5nZSwgbGluZXMu am9pbigiXG4iKSk7CkBAIC0xNDYyLDcgKzE0NzcsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX2NvbGxlY3RMaW5lc0Zyb21EaXY6IGZ1bmN0 aW9uKGxpbmVzLCBlbGVtZW50KQogICAgIHsKICAgICAgICAgdmFyIHRleHRDb250ZW50cyA9IFtd OwotICAgICAgICB2YXIgbm9kZSA9IGVsZW1lbnQudHJhdmVyc2VOZXh0Tm9kZShlbGVtZW50KTsK KyAgICAgICAgdmFyIG5vZGUgPSBlbGVtZW50Lm5vZGVUeXBlID09PSBOb2RlLlRFWFRfTk9ERSA/ IGVsZW1lbnQgOiBlbGVtZW50LnRyYXZlcnNlTmV4dE5vZGUoZWxlbWVudCk7CiAgICAgICAgIHdo aWxlIChub2RlKSB7CiAgICAgICAgICAgICBpZiAoZWxlbWVudC5kZWNvcmF0aW9uc0VsZW1lbnQg PT09IG5vZGUpIHsKICAgICAgICAgICAgICAgICBub2RlID0gbm9kZS5uZXh0U2libGluZzsK 88629 2011-04-07 07:17:38 -0700 2011-04-08 04:22:11 -0700 Patch bug-58025-20110407181729.patch text/plain 5594 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODMxNTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkNjlmZDE5NjZjYTIyYWU5 NzNhN2JlYjllMjk1ZTZmODE0MDJhNjNiLi4yOTcwOGMxYTFhZDRmNjk2ODg1ODBkNTYyZGI3ZmM0 NDE2YjJjNTZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMDcgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEJ1Z3MgaW4gc29tZSBjb3Ju ZXIgY2FzZXMgaW4gdGhlIHRleHQgZWRpdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01ODAyNQorCisgICAgICAgIFRoaXMgc29sdmVzIHRoZSBmb2xs b3dpbmcgYnVnczoKKyAgICAgICAgMSkgVGhlIHZlcnkgbGFzdCBfZW1wdHlfIGxpbmUgd291bGQg bm90IGJlIGRlbGV0ZWQgaWYgeW91IGhpdCBhIEJhY2tzcGFjZSBvbiBpdCwgb3IgdGhlIHNlbGVj dGlvbiB0ZXh0IHRvIGJlIGRlbGV0ZWQgaXMgZXh0ZW5kZWQgdG8gdGhlIHZlcnkgYm90dG9tIG9m IHRoZSBlZGl0b3IuCisgICAgICAgIDIpIEFuIG9kZCBjb3JuZXIgY2FzZTogZGVsZXRlIGFsbCBz b3VyY2UgY29kZSBmcm9tIHRoZSBlZGl0b3IsIGhpdCBiYWNrc3BhY2Ugb24gdGhlIG9ubHkgZW1w dHkgbGluZSwgdGhlbiBhZGQgYSBjaGFyYWN0ZXIuIEluIHRoaXMgY2FzZSB0aGUgYnJvd3NlciB3 aWxsIGluc2VydCBhIFRFWFQgbm9kZSBpbnN0ZWFkIG9mIGEgRElWIG5vZGUgZm9yIGEgbGluZVJv dy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fc2VsZWN0aW9u VG9Qb3NpdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUuX2VuY2xvc2luZ0xpbmVSb3dPclNlbGYpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9oYW5kbGVET01VcGRhdGVzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fYXBwbHlEb21V cGRhdGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3Rv dHlwZS5fY29sbGVjdExpbmVzRnJvbURpdik6CisKIDIwMTEtMDQtMDcgIEFkYW0gQmFydGggIDxh YmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwppbmRl eCBmZjAyMTE0ZDEzZGE0N2UxNzdhMTU1MmI4YThhZjM5OTA2NmM3YzA4Li4xNGYxYjI2YWNhMGMx MzEwNmZmNTQwMDdkODRkZmE4NTJhMGU5NDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv cHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dApAQCAtMTA4NCwxNCArMTA4NCwxNCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1h aW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChjb250YWluZXIgPT09IHRoaXMuX2Nv bnRhaW5lciAmJiBvZmZzZXQgPT09IDEpCiAgICAgICAgICAgICByZXR1cm4geyBsaW5lOiB0aGlz Ll90ZXh0TW9kZWwubGluZXNDb3VudCAtIDEsIGNvbHVtbjogdGhpcy5fdGV4dE1vZGVsLmxpbmVM ZW5ndGgodGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQgLSAxKSB9OwogCi0gICAgICAgIHZhciBs aW5lUm93ID0gY29udGFpbmVyLmVuY2xvc2luZ05vZGVPclNlbGZXaXRoTm9kZU5hbWUoIkRJViIp OworICAgICAgICB2YXIgbGluZVJvdyA9IHRoaXMuX2VuY2xvc2luZ0xpbmVSb3dPclNlbGYoY29u dGFpbmVyKTsKICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSBsaW5lUm93LmxpbmVOdW1iZXI7CiAg ICAgICAgIGlmIChjb250YWluZXIgPT09IGxpbmVSb3cgJiYgb2Zmc2V0ID09PSAwKQogICAgICAg ICAgICAgcmV0dXJuIHsgbGluZTogbGluZU51bWJlciwgY29sdW1uOiAwIH07CiAKICAgICAgICAg Ly8gVGhpcyBtYXkgYmUgY2h1bmsgYW5kIGNodW5rcyBtYXkgY29udGFpbiBcbi4KICAgICAgICAg dmFyIGNvbHVtbiA9IDA7Ci0gICAgICAgIHZhciBub2RlID0gbGluZVJvdy50cmF2ZXJzZU5leHRU ZXh0Tm9kZShsaW5lUm93KTsKKyAgICAgICAgdmFyIG5vZGUgPSBsaW5lUm93Lm5vZGVUeXBlID09 PSBOb2RlLlRFWFRfTk9ERSA/IGxpbmVSb3cgOiBsaW5lUm93LnRyYXZlcnNlTmV4dFRleHROb2Rl KGxpbmVSb3cpOwogICAgICAgICB3aGlsZSAobm9kZSAmJiBub2RlICE9PSBjb250YWluZXIpIHsK ICAgICAgICAgICAgIHZhciB0ZXh0ID0gbm9kZS50ZXh0Q29udGVudDsKICAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgdGV4dC5sZW5ndGg7ICsraSkgewpAQCAtMTEzNyw2ICsxMTM3LDE4 IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgcmV0dXJuIHJhbmdlQm91bmRhcnk7CiAgICAgfSwKIAorICAgIF9lbmNsb3NpbmdMaW5lUm93 T3JTZWxmOiBmdW5jdGlvbihlbGVtZW50KQorICAgIHsKKyAgICAgICAgdmFyIGxpbmVSb3cgPSBl bGVtZW50LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoIndlYmtpdC1saW5lLWNvbnRlbnQi KTsKKyAgICAgICAgaWYgKGxpbmVSb3cpCisgICAgICAgICAgICByZXR1cm4gbGluZVJvdzsKKyAg ICAgICAgZm9yICh2YXIgbGluZVJvdyA9IGVsZW1lbnQ7IGxpbmVSb3c7IGxpbmVSb3cgPSBsaW5l Um93LnBhcmVudEVsZW1lbnQpIHsKKyAgICAgICAgICAgIGlmIChsaW5lUm93LnBhcmVudEVsZW1l bnQgPT09IHRoaXMuX2NvbnRhaW5lcikKKyAgICAgICAgICAgICAgICByZXR1cm4gbGluZVJvdzsK KyAgICAgICAgfQorICAgICAgICByZXR1cm4gbnVsbDsKKyAgICB9LAorCiAgICAgX2FwcGVuZFNw YW46IGZ1bmN0aW9uKGVsZW1lbnQsIGNvbnRlbnQsIGNsYXNzTmFtZSkKICAgICB7CiAgICAgICAg IGlmIChjbGFzc05hbWUgPT09ICJodG1sLXJlc291cmNlLWxpbmsiIHx8IGNsYXNzTmFtZSA9PT0g Imh0bWwtZXh0ZXJuYWwtbGluayIpIHsKQEAgLTEyMDEsNyArMTIxMyw3IEBAIFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRhcmdldCA9 PT0gdGhpcy5fY29udGFpbmVyKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBs aW5lUm93ID0gdGFyZ2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoIndlYmtpdC1saW5l LWNvbnRlbnQiKTsKKyAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9lbmNsb3NpbmdMaW5lUm93 T3JTZWxmKHRhcmdldCk7CiAgICAgICAgIGlmICghbGluZVJvdykKICAgICAgICAgICAgIHJldHVy bjsKIApAQCAtMTIyOSw3ICsxMjQxLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFu ZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBlbmRMaW5lID0gc3RhcnRMaW5lICsgMTsK ICAgICAgICAgZm9yICh2YXIgcm93ID0gbGluZVJvdy5uZXh0U2libGluZzsgcm93OyByb3cgPSBy b3cubmV4dFNpYmxpbmcpIHsKLSAgICAgICAgICAgIGlmICh0eXBlb2Ygcm93LmxpbmVOdW1iZXIg PT09ICJudW1iZXIiKSB7CisgICAgICAgICAgICBpZiAodHlwZW9mIHJvdy5saW5lTnVtYmVyID09 PSAibnVtYmVyIiAmJiByb3cubGluZU51bWJlciA+IHN0YXJ0TGluZSkgewogICAgICAgICAgICAg ICAgIGVuZExpbmUgPSByb3cubGluZU51bWJlcjsKICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIH0KQEAgLTEzMTYsNiArMTMyOCw5IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGxpbmVzLmxlbmd0aCA9PT0gMCAm JiBlbmRMaW5lIDwgdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQpIHsKICAgICAgICAgICAgIHZh ciBvbGRSYW5nZSA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dFJhbmdlKHN0YXJ0TGluZSwgMCwgZW5k TGluZSwgMCk7CiAgICAgICAgICAgICB2YXIgbmV3UmFuZ2UgPSB0aGlzLl90ZXh0TW9kZWwuc2V0 VGV4dChvbGRSYW5nZSwgIiIpOworICAgICAgICB9IGVsc2UgaWYgKGxpbmVzLmxlbmd0aCA9PT0g MCAmJiBzdGFydExpbmUgPiAwKSB7CisgICAgICAgICAgICB2YXIgb2xkUmFuZ2UgPSBuZXcgV2Vi SW5zcGVjdG9yLlRleHRSYW5nZShzdGFydExpbmUgLSAxLCB0aGlzLl90ZXh0TW9kZWwubGluZUxl bmd0aChzdGFydExpbmUgLSAxKSwgZW5kTGluZSAtIDEsIHRoaXMuX3RleHRNb2RlbC5saW5lTGVu Z3RoKGVuZExpbmUgLSAxKSk7CisgICAgICAgICAgICB2YXIgbmV3UmFuZ2UgPSB0aGlzLl90ZXh0 TW9kZWwuc2V0VGV4dChvbGRSYW5nZSwgIiIpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgdmFyIG9sZFJhbmdlID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0UmFuZ2Uoc3RhcnRMaW5lLCAw LCBlbmRMaW5lIC0gMSwgdGhpcy5fdGV4dE1vZGVsLmxpbmVMZW5ndGgoZW5kTGluZSAtIDEpKTsK ICAgICAgICAgICAgIHZhciBuZXdSYW5nZSA9IHRoaXMuX3RleHRNb2RlbC5zZXRUZXh0KG9sZFJh bmdlLCBsaW5lcy5qb2luKCJcbiIpKTsKQEAgLTE0NjIsNyArMTQ3Nyw3IEBAIFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfY29sbGVjdExpbmVzRnJv bURpdjogZnVuY3Rpb24obGluZXMsIGVsZW1lbnQpCiAgICAgewogICAgICAgICB2YXIgdGV4dENv bnRlbnRzID0gW107Ci0gICAgICAgIHZhciBub2RlID0gZWxlbWVudC50cmF2ZXJzZU5leHROb2Rl KGVsZW1lbnQpOworICAgICAgICB2YXIgbm9kZSA9IGVsZW1lbnQubm9kZVR5cGUgPT09IE5vZGUu VEVYVF9OT0RFID8gZWxlbWVudCA6IGVsZW1lbnQudHJhdmVyc2VOZXh0Tm9kZShlbGVtZW50KTsK ICAgICAgICAgd2hpbGUgKG5vZGUpIHsKICAgICAgICAgICAgIGlmIChlbGVtZW50LmRlY29yYXRp b25zRWxlbWVudCA9PT0gbm9kZSkgewogICAgICAgICAgICAgICAgIG5vZGUgPSBub2RlLm5leHRT aWJsaW5nOwo=