49540 2010-11-15 07:03:13 -0800 Web Inspector: extract HTML title setter in treeoutline.js 2010-11-16 03:00:47 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 309266 0 pfeldman 2010-11-15 07:03:13 -0800 Setting textContent is faster than setting innerHMTL since it does not involve HTML parsing. 309267 1 73890 pfeldman 2010-11-15 07:07:16 -0800 Created attachment 73890 [PATCH] Proposed change. 309649 2 pfeldman 2010-11-16 03:00:47 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/AuditResultView.js M WebCore/inspector/front-end/ElementsTreeOutline.js M WebCore/inspector/front-end/ObjectPropertiesSection.js M WebCore/inspector/front-end/ResourceView.js M WebCore/inspector/front-end/StylesSidebarPane.js M WebCore/inspector/front-end/WorkersSidebarPane.js M WebCore/inspector/front-end/treeoutline.js Committed r72072 73890 2010-11-15 07:07:16 -0800 2010-11-15 12:30:48 -0800 [PATCH] Proposed change. title_html text/plain 10922 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWMxZWRhZi4uOTk4YTQ1NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMS0xNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBleHRyYWN0IEhUTUwgdGl0bGUgc2V0 dGVyIGluIHRyZWVvdXRsaW5lLmpzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDk1NDAKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNUcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVF bGVtZW50LnByb3RvdHlwZS5hZGp1c3RDb2xsYXBzZWRSYW5nZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRlVGl0bGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanM6CisgICAgICAgIChUcmVlRWxl bWVudC5wcm90b3R5cGUuZ2V0IHRpdGxlSFRNTCk6CisgICAgICAgIChUcmVlRWxlbWVudC5wcm90 b3R5cGUuc2V0IHRpdGxlSFRNTCk6CisgICAgICAgIChUcmVlRWxlbWVudC5wcm90b3R5cGUuX3Nl dExpc3RJdGVtTm9kZUNvbnRlbnQpOgorCiAyMDEwLTExLTE0ICBEYXZpZCBIeWF0dCAgPGh5YXR0 QGFwcGxlLmNvbT4KIAogICAgICAgICBCYWNrIG91dCB0aGUgaXRhbGljcyBwb3J0aW9uIG9mIHRo ZSBwcmV2aW91cyBwYXRjaCB1bnRpbCBJIGNhbiBmaWd1cmUgb3V0IHdoeSBpdApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwppbmRleCBh OWQ4NmU2Li5mODkzY2EwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNUcmVlT3V0bGluZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtNjAwLDggKzYwMCw4IEBAIFdlYkluc3BlY3Rvci5F bGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGNoaWxkTm9kZUNv dW50ID4gdGhpcy5leHBhbmRlZENoaWxkQ291bnQpIHsKICAgICAgICAgICAgIHZhciB0YXJnZXRC dXR0b25JbmRleCA9IGV4cGFuZGVkQ2hpbGRDb3VudDsKICAgICAgICAgICAgIGlmICghdGhpcy5l eHBhbmRBbGxCdXR0b25FbGVtZW50KSB7Ci0gICAgICAgICAgICAgICAgdmFyIHRpdGxlID0gIjxi dXR0b24gY2xhc3M9XCJzaG93LWFsbC1ub2Rlc1wiIHZhbHVlPVwiXCIgLz4iOwotICAgICAgICAg ICAgICAgIHZhciBpdGVtID0gbmV3IFRyZWVFbGVtZW50KHRpdGxlLCBudWxsLCBmYWxzZSk7Cisg ICAgICAgICAgICAgICAgdmFyIGl0ZW0gPSBuZXcgVHJlZUVsZW1lbnQobnVsbCwgbnVsbCwgZmFs c2UpOworICAgICAgICAgICAgICAgIGl0ZW0udGl0bGVIVE1MID0gIjxidXR0b24gY2xhc3M9XCJz aG93LWFsbC1ub2Rlc1wiIHZhbHVlPVwiXCIgLz4iOwogICAgICAgICAgICAgICAgIGl0ZW0uc2Vs ZWN0YWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgICAgIGl0ZW0uZXhwYW5kQWxsQnV0dG9uID0g dHJ1ZTsKICAgICAgICAgICAgICAgICB0aGlzLmluc2VydENoaWxkKGl0ZW0sIHRhcmdldEJ1dHRv bkluZGV4KTsKQEAgLTExODIsOCArMTE4Miw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX2VkaXRpbmcpCiAgICAgICAg ICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIHRpdGxlID0gdGhpcy5fbm9kZVRpdGxlSW5mbyhX ZWJJbnNwZWN0b3IubGlua2lmeVVSTCkudGl0bGU7Ci0gICAgICAgIHRoaXMudGl0bGUgPSAiPHNw YW4gY2xhc3M9XCJoaWdobGlnaHRcIj4iICsgdGl0bGUgKyAiPC9zcGFuPiI7CisgICAgICAgIHRo aXMudGl0bGVIVE1MID0gIjxzcGFuIGNsYXNzPVwiaGlnaGxpZ2h0XCI+IiArIHRoaXMuX25vZGVU aXRsZUluZm8oV2ViSW5zcGVjdG9yLmxpbmtpZnlVUkwpLnRpdGxlSFRNTCArICI8L3NwYW4+IjsK ICAgICAgICAgZGVsZXRlIHRoaXMuc2VsZWN0aW9uRWxlbWVudDsKICAgICAgICAgdGhpcy51cGRh dGVTZWxlY3Rpb24oKTsKICAgICAgICAgdGhpcy5fcHJldmVudEZvbGxvd2luZ0xpbmtzT25Eb3Vi bGVDbGljaygpOwpAQCAtMTIzMyw1MyArMTIzMiw1NCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNU cmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgX25vZGVUaXRsZUluZm86IGZ1bmN0aW9uKGxp bmtpZnkpCiAgICAgewogICAgICAgICB2YXIgbm9kZSA9IHRoaXMucmVwcmVzZW50ZWRPYmplY3Q7 Ci0gICAgICAgIHZhciBpbmZvID0ge3RpdGxlOiAiIiwgaGFzQ2hpbGRyZW46IHRoaXMuaGFzQ2hp bGRyZW59OworICAgICAgICB2YXIgaW5mbyA9IHt0aXRsZUhUTUw6ICIiLCBoYXNDaGlsZHJlbjog dGhpcy5oYXNDaGlsZHJlbn07CiAKICAgICAgICAgc3dpdGNoIChub2RlLm5vZGVUeXBlKSB7CiAg ICAgICAgICAgICBjYXNlIE5vZGUuRE9DVU1FTlRfTk9ERToKLSAgICAgICAgICAgICAgICBpbmZv LnRpdGxlID0gIkRvY3VtZW50IjsKKyAgICAgICAgICAgICAgICBpbmZvLnRpdGxlSFRNTCA9ICJE b2N1bWVudCI7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgTm9k ZS5ET0NVTUVOVF9GUkFHTUVOVF9OT0RFOgotICAgICAgICAgICAgICAgIGluZm8udGl0bGUgPSAi RG9jdW1lbnQgRnJhZ21lbnQiOworICAgICAgICAgICAgICAgIGluZm8udGl0bGVIVE1MID0gIkRv Y3VtZW50IEZyYWdtZW50IjsKICAgICAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAgICAg Y2FzZSBOb2RlLkFUVFJJQlVURV9OT0RFOgogICAgICAgICAgICAgICAgIHZhciB2YWx1ZSA9IG5v ZGUudmFsdWUgfHwgIlx1MjAwQiI7IC8vIFplcm8gd2lkdGggc3BhY2UgdG8gZm9yY2Ugc2hvd2lu ZyBhbiBlbXB0eSB2YWx1ZS4KLSAgICAgICAgICAgICAgICBpbmZvLnRpdGxlID0gdGhpcy5fYXR0 cmlidXRlSFRNTChub2RlLm5hbWUsIHZhbHVlKTsKKyAgICAgICAgICAgICAgICBpbmZvLnRpdGxl SFRNTCA9IHRoaXMuX2F0dHJpYnV0ZUhUTUwobm9kZS5uYW1lLCB2YWx1ZSk7CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgTm9kZS5FTEVNRU5UX05PREU6CiAgICAg ICAgICAgICAgICAgdmFyIHRhZ05hbWUgPSB0aGlzLnRyZWVPdXRsaW5lLm5vZGVOYW1lVG9Db3Jy ZWN0Q2FzZShub2RlLm5vZGVOYW1lKS5lc2NhcGVIVE1MKCk7CiAgICAgICAgICAgICAgICAgaWYg KHRoaXMuX2VsZW1lbnRDbG9zZVRhZykgewotICAgICAgICAgICAgICAgICAgICBpbmZvLnRpdGxl ID0gdGhpcy5fdGFnSFRNTCh0YWdOYW1lLCB0cnVlLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAg ICAgaW5mby50aXRsZUhUTUwgPSB0aGlzLl90YWdIVE1MKHRhZ05hbWUsIHRydWUsIHRydWUpOwog ICAgICAgICAgICAgICAgICAgICBpbmZvLmhhc0NoaWxkcmVuID0gZmFsc2U7CiAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGlu Zm8udGl0bGUgPSB0aGlzLl90YWdIVE1MKHRhZ05hbWUsIGZhbHNlLCBmYWxzZSwgbGlua2lmeSk7 CisgICAgICAgICAgICAgICAgdmFyIHRpdGxlSFRNTCA9IHRoaXMuX3RhZ0hUTUwodGFnTmFtZSwg ZmFsc2UsIGZhbHNlLCBsaW5raWZ5KTsKIAogICAgICAgICAgICAgICAgIHZhciB0ZXh0Q2hpbGQg PSBvbmx5VGV4dENoaWxkLmNhbGwobm9kZSk7CiAgICAgICAgICAgICAgICAgdmFyIHNob3dJbmxp bmVUZXh0ID0gdGV4dENoaWxkICYmIHRleHRDaGlsZC50ZXh0Q29udGVudC5sZW5ndGggPCBQcmVm ZXJlbmNlcy5tYXhJbmxpbmVUZXh0Q2hpbGRMZW5ndGg7CiAKICAgICAgICAgICAgICAgICBpZiAo IXRoaXMuZXhwYW5kZWQgJiYgKCFzaG93SW5saW5lVGV4dCAmJiAodGhpcy50cmVlT3V0bGluZS5p c1hNTE1pbWVUeXBlIHx8ICFXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5Gb3JiaWRk ZW5DbG9zaW5nVGFnRWxlbWVudHNbdGFnTmFtZV0pKSkgewogICAgICAgICAgICAgICAgICAgICBp ZiAodGhpcy5oYXNDaGlsZHJlbikKLSAgICAgICAgICAgICAgICAgICAgICAgIGluZm8udGl0bGUg Kz0gIjxzcGFuIGNsYXNzPVwid2Via2l0LWh0bWwtdGV4dC1ub2RlXCI+JiM4MjMwOzwvc3Bhbj4m IzgyMDM7IjsKLSAgICAgICAgICAgICAgICAgICAgaW5mby50aXRsZSArPSB0aGlzLl90YWdIVE1M KHRhZ05hbWUsIHRydWUsIGZhbHNlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpdGxlSFRN TCArPSAiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC10ZXh0LW5vZGVcIj4mIzgyMzA7PC9zcGFu PiYjODIwMzsiOworICAgICAgICAgICAgICAgICAgICB0aXRsZUhUTUwgKz0gdGhpcy5fdGFnSFRN TCh0YWdOYW1lLCB0cnVlLCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICAgICAgLy8gSWYgdGhpcyBlbGVtZW50IG9ubHkgaGFzIGEgc2luZ2xlIGNoaWxkIHRoYXQgaXMg YSB0ZXh0IG5vZGUsCiAgICAgICAgICAgICAgICAgLy8ganVzdCBzaG93IHRoYXQgdGV4dCBhbmQg dGhlIGNsb3NpbmcgdGFnIGlubGluZSByYXRoZXIgdGhhbgogICAgICAgICAgICAgICAgIC8vIGNy ZWF0ZSBhIHN1YnRyZWUgZm9yIHRoZW0KICAgICAgICAgICAgICAgICBpZiAoc2hvd0lubGluZVRl eHQpIHsKLSAgICAgICAgICAgICAgICAgICAgaW5mby50aXRsZSArPSAiPHNwYW4gY2xhc3M9XCJ3 ZWJraXQtaHRtbC10ZXh0LW5vZGVcIj4iICsgdGV4dENoaWxkLm5vZGVWYWx1ZS5lc2NhcGVIVE1M KCkgKyAiPC9zcGFuPiYjODIwMzsiICsgdGhpcy5fdGFnSFRNTCh0YWdOYW1lLCB0cnVlLCBmYWxz ZSk7CisgICAgICAgICAgICAgICAgICAgIHRpdGxlSFRNTCArPSAiPHNwYW4gY2xhc3M9XCJ3ZWJr aXQtaHRtbC10ZXh0LW5vZGVcIj4iICsgdGV4dENoaWxkLm5vZGVWYWx1ZS5lc2NhcGVIVE1MKCkg KyAiPC9zcGFuPiYjODIwMzsiICsgdGhpcy5fdGFnSFRNTCh0YWdOYW1lLCB0cnVlLCBmYWxzZSk7 CiAgICAgICAgICAgICAgICAgICAgIGluZm8uaGFzQ2hpbGRyZW4gPSBmYWxzZTsKICAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgaW5mby50aXRsZUhUTUwgPSB0aXRsZUhUTUw7CiAg ICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgTm9kZS5URVhUX05PREU6 CiAgICAgICAgICAgICAgICAgaWYgKGlzTm9kZVdoaXRlc3BhY2UuY2FsbChub2RlKSkKLSAgICAg ICAgICAgICAgICAgICAgaW5mby50aXRsZSA9ICIod2hpdGVzcGFjZSkiOworICAgICAgICAgICAg ICAgICAgICBpbmZvLnRpdGxlSFRNTCA9ICIod2hpdGVzcGFjZSkiOwogICAgICAgICAgICAgICAg IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBpZiAobm9kZS5wYXJlbnROb2RlICYmIG5vZGUu cGFyZW50Tm9kZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpID09PSAic2NyaXB0IikgewogICAgICAg ICAgICAgICAgICAgICAgICAgdmFyIG5ld05vZGUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJz cGFuIik7CkBAIC0xMjg4LDcgKzEyODgsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgICAgICB2YXIgamF2YXNjcmlw dFN5bnRheEhpZ2hsaWdodGVyID0gbmV3IFdlYkluc3BlY3Rvci5ET01TeW50YXhIaWdobGlnaHRl cigidGV4dC9qYXZhc2NyaXB0Iik7CiAgICAgICAgICAgICAgICAgICAgICAgICBqYXZhc2NyaXB0 U3ludGF4SGlnaGxpZ2h0ZXIuc3ludGF4SGlnaGxpZ2h0Tm9kZShuZXdOb2RlKTsKIAotICAgICAg ICAgICAgICAgICAgICAgICAgaW5mby50aXRsZSA9ICI8c3BhbiBjbGFzcz1cIndlYmtpdC1odG1s LXRleHQtbm9kZSB3ZWJraXQtaHRtbC1qcy1ub2RlXCI+IiArIG5ld05vZGUuaW5uZXJIVE1MLnJl cGxhY2UoL15bXG5ccl0qLywgIiIpLnJlcGxhY2UoL1xzKiQvLCAiIikgKyAiPC9zcGFuPiI7Cisg ICAgICAgICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlSFRNTCA9ICI8c3BhbiBjbGFzcz1cIndl YmtpdC1odG1sLXRleHQtbm9kZSB3ZWJraXQtaHRtbC1qcy1ub2RlXCI+IiArIG5ld05vZGUuaW5u ZXJIVE1MLnJlcGxhY2UoL15bXG5ccl0qLywgIiIpLnJlcGxhY2UoL1xzKiQvLCAiIikgKyAiPC9z cGFuPiI7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobm9kZS5wYXJlbnROb2RlICYm IG5vZGUucGFyZW50Tm9kZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpID09PSAic3R5bGUiKSB7CiAg ICAgICAgICAgICAgICAgICAgICAgICB2YXIgbmV3Tm9kZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoInNwYW4iKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG5ld05vZGUudGV4dENvbnRlbnQg PSBub2RlLnRleHRDb250ZW50OwpAQCAtMTI5NiwzNSArMTI5NiwzNSBAQCBXZWJJbnNwZWN0b3Iu RWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgICAg ICB2YXIgY3NzU3ludGF4SGlnaGxpZ2h0ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkRPTVN5bnRheEhp Z2hsaWdodGVyKCJ0ZXh0L2NzcyIpOwogICAgICAgICAgICAgICAgICAgICAgICAgY3NzU3ludGF4 SGlnaGxpZ2h0ZXIuc3ludGF4SGlnaGxpZ2h0Tm9kZShuZXdOb2RlKTsKIAotICAgICAgICAgICAg ICAgICAgICAgICAgaW5mby50aXRsZSA9ICI8c3BhbiBjbGFzcz1cIndlYmtpdC1odG1sLXRleHQt bm9kZSB3ZWJraXQtaHRtbC1jc3Mtbm9kZVwiPiIgKyBuZXdOb2RlLmlubmVySFRNTC5yZXBsYWNl KC9eW1xuXHJdKi8sICIiKS5yZXBsYWNlKC9ccyokLywgIiIpICsgIjwvc3Bhbj4iOwotICAgICAg ICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAgICAgaW5mby50aXRs ZSA9ICJcIjxzcGFuIGNsYXNzPVwid2Via2l0LWh0bWwtdGV4dC1ub2RlXCI+IiArIG5vZGUubm9k ZVZhbHVlLmVzY2FwZUhUTUwoKSArICI8L3NwYW4+XCIiOwotICAgICAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlSFRNTCA9ICI8c3BhbiBjbGFzcz1c IndlYmtpdC1odG1sLXRleHQtbm9kZSB3ZWJraXQtaHRtbC1jc3Mtbm9kZVwiPiIgKyBuZXdOb2Rl LmlubmVySFRNTC5yZXBsYWNlKC9eW1xuXHJdKi8sICIiKS5yZXBsYWNlKC9ccyokLywgIiIpICsg Ijwvc3Bhbj4iOworICAgICAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICAg ICAgICAgIGluZm8udGl0bGVIVE1MID0gIlwiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC10ZXh0 LW5vZGVcIj4iICsgbm9kZS5ub2RlVmFsdWUuZXNjYXBlSFRNTCgpICsgIjwvc3Bhbj5cIiI7CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICBj YXNlIE5vZGUuQ09NTUVOVF9OT0RFOgotICAgICAgICAgICAgICAgIGluZm8udGl0bGUgPSAiPHNw YW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC1jb21tZW50XCI+Jmx0OyEtLSIgKyBub2RlLm5vZGVWYWx1 ZS5lc2NhcGVIVE1MKCkgKyAiLS0mZ3Q7PC9zcGFuPiI7CisgICAgICAgICAgICAgICAgaW5mby50 aXRsZUhUTUwgPSAiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC1jb21tZW50XCI+Jmx0OyEtLSIg KyBub2RlLm5vZGVWYWx1ZS5lc2NhcGVIVE1MKCkgKyAiLS0mZ3Q7PC9zcGFuPiI7CiAgICAgICAg ICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgTm9kZS5ET0NVTUVOVF9UWVBFX05P REU6Ci0gICAgICAgICAgICAgICAgaW5mby50aXRsZSA9ICI8c3BhbiBjbGFzcz1cIndlYmtpdC1o dG1sLWRvY3R5cGVcIj4mbHQ7IURPQ1RZUEUgIiArIG5vZGUubm9kZU5hbWU7CisgICAgICAgICAg ICAgICAgdmFyIHRpdGxlSFRNTCA9ICI8c3BhbiBjbGFzcz1cIndlYmtpdC1odG1sLWRvY3R5cGVc Ij4mbHQ7IURPQ1RZUEUgIiArIG5vZGUubm9kZU5hbWU7CiAgICAgICAgICAgICAgICAgaWYgKG5v ZGUucHVibGljSWQpIHsKLSAgICAgICAgICAgICAgICAgICAgaW5mby50aXRsZSArPSAiIFBVQkxJ QyBcIiIgKyBub2RlLnB1YmxpY0lkICsgIlwiIjsKKyAgICAgICAgICAgICAgICAgICAgdGl0bGVI VE1MICs9ICIgUFVCTElDIFwiIiArIG5vZGUucHVibGljSWQgKyAiXCIiOwogICAgICAgICAgICAg ICAgICAgICBpZiAobm9kZS5zeXN0ZW1JZCkKLSAgICAgICAgICAgICAgICAgICAgICAgIGluZm8u dGl0bGUgKz0gIiBcIiIgKyBub2RlLnN5c3RlbUlkICsgIlwiIjsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHRpdGxlSFRNTCArPSAiIFwiIiArIG5vZGUuc3lzdGVtSWQgKyAiXCIiOwogICAgICAg ICAgICAgICAgIH0gZWxzZSBpZiAobm9kZS5zeXN0ZW1JZCkKLSAgICAgICAgICAgICAgICAgICAg aW5mby50aXRsZSArPSAiIFNZU1RFTSBcIiIgKyBub2RlLnN5c3RlbUlkICsgIlwiIjsKKyAgICAg ICAgICAgICAgICAgICAgdGl0bGVIVE1MICs9ICIgU1lTVEVNIFwiIiArIG5vZGUuc3lzdGVtSWQg KyAiXCIiOwogICAgICAgICAgICAgICAgIGlmIChub2RlLmludGVybmFsU3Vic2V0KQotICAgICAg ICAgICAgICAgICAgICBpbmZvLnRpdGxlICs9ICIgWyIgKyBub2RlLmludGVybmFsU3Vic2V0ICsg Il0iOwotICAgICAgICAgICAgICAgIGluZm8udGl0bGUgKz0gIiZndDs8L3NwYW4+IjsKKyAgICAg ICAgICAgICAgICAgICAgdGl0bGVIVE1MICs9ICIgWyIgKyBub2RlLmludGVybmFsU3Vic2V0ICsg Il0iOworICAgICAgICAgICAgICAgIHRpdGxlSFRNTCArPSAiJmd0Ozwvc3Bhbj4iOworICAgICAg ICAgICAgICAgIGluZm8udGl0bGVIVE1MID0gdGl0bGVIVE1MOwogICAgICAgICAgICAgICAgIGJy ZWFrOwogCiAgICAgICAgICAgICBjYXNlIE5vZGUuQ0RBVEFfU0VDVElPTl9OT0RFOgotICAgICAg ICAgICAgICAgIGluZm8udGl0bGUgPSAiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC10ZXh0LW5v ZGVcIj4mbHQ7IVtDREFUQVsiICsgbm9kZS5ub2RlVmFsdWUuZXNjYXBlSFRNTCgpICsgIl1dJmd0 Ozwvc3Bhbj4iOworICAgICAgICAgICAgICAgIGluZm8udGl0bGVIVE1MID0gIjxzcGFuIGNsYXNz PVwid2Via2l0LWh0bWwtdGV4dC1ub2RlXCI+Jmx0OyFbQ0RBVEFbIiArIG5vZGUubm9kZVZhbHVl LmVzY2FwZUhUTUwoKSArICJdXSZndDs8L3NwYW4+IjsKICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgaW5mby50aXRsZSA9IHRoaXMu dHJlZU91dGxpbmUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKG5vZGUubm9kZU5hbWUpLmNvbGxhcHNl V2hpdGVzcGFjZSgpLmVzY2FwZUhUTUwoKTsKKyAgICAgICAgICAgICAgICBpbmZvLnRpdGxlSFRN TCA9IHRoaXMudHJlZU91dGxpbmUubm9kZU5hbWVUb0NvcnJlY3RDYXNlKG5vZGUubm9kZU5hbWUp LmNvbGxhcHNlV2hpdGVzcGFjZSgpLmVzY2FwZUhUTUwoKTsKICAgICAgICAgfQogCiAgICAgICAg IHJldHVybiBpbmZvOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3Ry ZWVvdXRsaW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpz CmluZGV4IGUyZjg3OWMuLmExZTA1MmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC90cmVlb3V0bGluZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv dHJlZW91dGxpbmUuanMKQEAgLTQ4NSw2ICs0ODUsMTUgQEAgVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl9zZXRMaXN0SXRlbU5vZGVDb250ZW50KCk7CiAgICAgfSwKIAor ICAgIGdldCB0aXRsZUhUTUwoKSB7CisgICAgICAgIHJldHVybiB0aGlzLl90aXRsZUhUTUw7Cisg ICAgfSwKKworICAgIHNldCB0aXRsZUhUTUwoeCkgeworICAgICAgICB0aGlzLl90aXRsZUhUTUwg PSB4OworICAgICAgICB0aGlzLl9zZXRMaXN0SXRlbU5vZGVDb250ZW50KCk7CisgICAgfSwKKwog ICAgIGdldCB0b29sdGlwKCkgewogICAgICAgICByZXR1cm4gdGhpcy5fdG9vbHRpcDsKICAgICB9 LApAQCAtNTUzLDggKzU2MiwxMyBAQCBUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICBpZiAoIXRoaXMuX2xpc3RJdGVtTm9kZSkKICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgaWYgKCF0aGlzLl90aXRsZSB8fCB0eXBlb2YgdGhpcy5fdGl0bGUgPT09ICJzdHJpbmci KQotICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmlubmVySFRNTCA9IHRoaXMuX3RpdGxl OworCisgICAgICAgIGlmICghdGhpcy5fdGl0bGVIVE1MICYmICF0aGlzLl90aXRsZSkKKyAgICAg ICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICBlbHNl IGlmICh0eXBlb2YgdGhpcy5fdGl0bGVIVE1MID09PSAic3RyaW5nIikKKyAgICAgICAgICAgIHRo aXMuX2xpc3RJdGVtTm9kZS5pbm5lckhUTUwgPSB0aGlzLl90aXRsZUhUTUw7CisgICAgICAgIGVs c2UgaWYgKHR5cGVvZiB0aGlzLl90aXRsZSA9PT0gInN0cmluZyIpCisgICAgICAgICAgICB0aGlz Ll9saXN0SXRlbU5vZGUudGV4dENvbnRlbnQgPSB0aGlzLl90aXRsZTsKICAgICAgICAgZWxzZSB7 CiAgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAg ICAgICAgIGlmICh0aGlzLl90aXRsZS5wYXJlbnROb2RlKQo=