78123 2012-02-08 09:36:35 -0800 Web Inspector: toggle Edit as HTML on F2, drag nodes up / down upon Ctrl(Cmd) Up / Down. 2012-02-09 04:24:46 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 552210 0 pfeldman 2012-02-08 09:36:35 -0800 It almost allows working with DOM using keyboard only. 552211 1 126102 pfeldman 2012-02-08 09:38:53 -0800 Created attachment 126102 Patch 552956 2 126102 apavlov 2012-02-09 01:26:57 -0800 Comment on attachment 126102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126102&action=review > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:509 > + if (event.keyIdentifier === "Up" && node.previousSibling && node.parentNode) { You could move the node.parentNode check one level above. > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:1727 > + if (!this.representedObject.parentNode || this.representedObject.parentNode.nodeType() == Node.DOCUMENT_NODE) === ? > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:1763 > + if (initialValue != value) !== ? > LayoutTests/inspector/elements/undo-dom-edits-expected.txt:56 > + + <div id="node-to-edit-as-html">…</div> Should the node change its expanded state after the HTML-wise editing? 553007 3 126102 yurys 2012-02-09 03:16:35 -0800 Comment on attachment 126102 Patch + if (event.keyIdentifier === "Down" && node.nextSibling && node.parentNode) { + node.moveTo(node.parentNode, node.nextSibling.nextSibling, this._selectNodeAfterEdit.bind(this, null, treeElement.expanded)); Will it work fine if node.nextSibling.nextSibling === null? 553039 4 pfeldman 2012-02-09 04:05:42 -0800 (In reply to comment #3) > (From update of attachment 126102 [details]) > + if (event.keyIdentifier === "Down" && node.nextSibling && node.parentNode) { > + node.moveTo(node.parentNode, node.nextSibling.nextSibling, this._selectNodeAfterEdit.bind(this, null, treeElement.expanded)); > > Will it work fine if node.nextSibling.nextSibling === null? Yes. 553047 5 pfeldman 2012-02-09 04:20:01 -0800 (In reply to comment #2) > (From update of attachment 126102 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=126102&action=review > > > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:509 > > + if (event.keyIdentifier === "Up" && node.previousSibling && node.parentNode) { > > You could move the node.parentNode check one level above. > Done. > > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:1727 > > + if (!this.representedObject.parentNode || this.representedObject.parentNode.nodeType() == Node.DOCUMENT_NODE) > > === ? Done. > > > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:1763 > > + if (initialValue != value) > > !== ? > Done. > > LayoutTests/inspector/elements/undo-dom-edits-expected.txt:56 > > + + <div id="node-to-edit-as-html">…</div> > > Should the node change its expanded state after the HTML-wise editing? Good point. It will be expanded, but it happends asynchronously. That's why the expectations are looking this way. Let me see if I can improve it. 553048 6 pfeldman 2012-02-09 04:24:46 -0800 Committed r107217: <http://trac.webkit.org/changeset/107217> 126102 2012-02-08 09:38:53 -0800 2012-02-09 03:16:35 -0800 Patch bug-78123-20120208213851.patch text/plain 15983 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc2Mjk4Mzk2ZWJhZjkw MGQyNTQ0MTIyN2VlNDhkYzE2ZDU5MjUyYi4uZTczOGRhYzU5MjNhNDIwMWJjYmYyOGIwYWJkM2E4 Y2RlNjU2Yjg1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDEyLTAyLTA4ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiB0b2dnbGUgRWRpdCBhcyBIVE1MIG9uIEYyLCBkcmFnIG5vZGVzIHVwIC8gZG93biB1cG9uIEN0 cmwoQ21kKSBVcCAvIERvd24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03ODEyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JET01BZ2VudDo6U2V0T3V0ZXJIVE1MQWN0aW9uOjpTZXRPdXRlckhUTUxBY3Rpb24pOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OlNldE91dGVySFRNTEFjdGlvbjo6 dW5kbyk6CisgICAgICAgIChJbnNwZWN0b3JET01BZ2VudDo6U2V0T3V0ZXJIVE1MQWN0aW9uKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuX3JlZ2lzdGVyU2hvcnRjdXRz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZS5oYW5kbGVT aG9ydGN1dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRs aW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90 eXBlLl9vbmRyYWdzdGFydCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0 bGluZS5wcm90b3R5cGUuX29uZHJhZ292ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1l bnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9kb01vdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9vbmRyYWdlbmQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9wb3B1bGF0ZUNvbnRleHRN ZW51KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlw ZS5oYW5kbGVTaG9ydGN1dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0 bGluZS5wcm90b3R5cGUuX3RvZ2dsZUVkaXRBc0hUTUwpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9zZWxlY3ROb2RlQWZ0ZXJFZGl0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZS5fc3RhcnRF ZGl0aW5nQXNIVE1MLmNvbW1pdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVl RWxlbWVudC5wcm90b3R5cGUuX3RhZ05hbWVFZGl0aW5nQ29tbWl0dGVkLmNoYW5nZVRhZ05hbWVD YWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90 b3R5cGUuX3RhZ05hbWVFZGl0aW5nQ29tbWl0dGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1VJVXRpbHMuanM6CisKKzIwMTItMDItMDggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBnb29nbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGJpbmQgZW50aXJlIHN1YnRy ZWUgdXBvbiBjaGlsZE5vZGVJbnNlcnRlZCBzbyB0aGF0IHRleHQgbm9kZSB3ZXJlIGFjY291bnRl ZC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4MTE2 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cwppbmRleCA0ZDBlZDQ5MjdhZmFjNzExNGM3ZDdjYzgyZTEzYmQ3M2JjNWMzNzJjLi40ODAxYWVl NDJlYTVmNjU3Yjc5MmZkYjQ0YTFhNzQ5YTI1ZWMxY2U2IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNo CmRlbHRhIDM5CnJjbWFFSms+JVlibVdDfmlaIXspbkhMNmJqeU8pbktiQEg3KyQ7ck19VCQ2NDBM M2xDJWNjMmp0CgpkZWx0YSAxMQpTY21hRU5pUkh+am1XQ35pWiFgY1c5fGd8PAoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDM3NzcxNjkz ZmNiYzAyYzk3ZmRlNWFkM2E5ODI1MmMyMmZiMjZiNTAuLjk4MTg1YzE3OGI3MDZiMTQyNWZjNGFm YmNiNDdkYTIxNjk0Zjg5ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmNwcApAQCAtMzQ5LDYgKzM0OSw3IEBAIHB1YmxpYzoKICAgICBTZXRPdXRl ckhUTUxBY3Rpb24oTm9kZSogbm9kZSwgY29uc3QgU3RyaW5nJiBodG1sKQogICAgICAgICA6IElu c3BlY3RvckRPTUFnZW50OjpET01BY3Rpb24oIlNldE91dGVySFRNTCIpCiAgICAgICAgICwgbV9u b2RlKG5vZGUpCisgICAgICAgICwgbV9uZXh0U2libGluZyhub2RlLT5uZXh0U2libGluZygpKQog ICAgICAgICAsIG1faHRtbChodG1sKQogICAgICAgICAsIG1fbmV3Tm9kZSgwKQogICAgIHsKQEAg LTM2NCw4ICszNjUsMTggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIHVuZG8oRXhjZXB0 aW9uQ29kZSYgZWMpCiAgICAgewotICAgICAgICBET01FZGl0b3IgZG9tRWRpdG9yKG1fbm9kZS0+ b3duZXJEb2N1bWVudCgpKTsKLSAgICAgICAgZG9tRWRpdG9yLnBhdGNoTm9kZShtX25vZGUuZ2V0 KCksIG1fb2xkSFRNTCwgZWMpOworICAgICAgICBET01FZGl0b3IgZG9tRWRpdG9yKG1fbmV3Tm9k ZS0+b3duZXJEb2N1bWVudCgpKTsKKyAgICAgICAgTm9kZSogbm9kZSA9IGRvbUVkaXRvci5wYXRj aE5vZGUobV9uZXdOb2RlLCBtX29sZEhUTUwsIGVjKTsKKyAgICAgICAgaWYgKGVjIHx8ICFub2Rl KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAvLyBIVE1MIGVkaXRpbmcgY291 bGQgaGF2ZSBwcm9kdWNlZCBleHRyYSBub2Rlcy4gUmVtb3ZlIHRoZW0gaWYgbmVjZXNzYXJ5Lgor ICAgICAgICBub2RlID0gbm9kZS0+bmV4dFNpYmxpbmcoKTsKKworICAgICAgICB3aGlsZSAoIWVj ICYmIG5vZGUgJiYgbm9kZSAhPSBtX25leHRTaWJsaW5nLmdldCgpKSB7CisgICAgICAgICAgICBO b2RlKiBub2RlVG9SZW1vdmUgPSBub2RlOworICAgICAgICAgICAgbm9kZSA9IG5vZGUtPm5leHRT aWJsaW5nKCk7CisgICAgICAgICAgICBub2RlVG9SZW1vdmUtPnJlbW92ZShlYyk7CisgICAgICAg IH0KICAgICAgICAgcmV0dXJuICFlYzsKICAgICB9CiAKQEAgLTM3Niw2ICszODcsNyBAQCBwdWJs aWM6CiAKIHByaXZhdGU6CiAgICAgUmVmUHRyPE5vZGU+IG1fbm9kZTsKKyAgICBSZWZQdHI8Tm9k ZT4gbV9uZXh0U2libGluZzsKICAgICBTdHJpbmcgbV9odG1sOwogICAgIFN0cmluZyBtX29sZEhU TUw7CiAgICAgTm9kZSogbV9uZXdOb2RlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IGNhYWU3ZTg4N2M2Y2Q2NGNjY2U2 OWI4Mjg0YjQxMWU5ZTdkYjE3ZWUuLjM1ODVlMzJhZTllMzZiMmRjMDk4ZjExMTVkODg4YTMxNzg3 YWRlMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Vs ZW1lbnRzUGFuZWwuanMKQEAgLTkwNCw2ICs5MDQsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIF07CiAgICAgICAgIHNlY3Rpb24uYWRkUmVsYXRl ZEtleXMoa2V5cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFeHBhbmQvY29sbGFwc2UiKSk7CiAg ICAgICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoc2hvcnRjdXQu S2V5cy5FbnRlciksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRWRpdCBhdHRyaWJ1dGUiKSk7Cisg ICAgICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoc2hvcnRjdXQu S2V5cy5GMiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVG9nZ2xlIGVkaXQgYXMgSFRNTCIpKTsK IAogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5zdHlsZXMucmVnaXN0ZXJTaG9ydGN1dHMoKTsK ICAgICB9LApAQCAtOTI1LDggKzkyNiwxMyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KLSAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LmV2ZW50SGFzQ3Ry bE9yTWV0YShldmVudCkgJiYgZXZlbnQua2V5SWRlbnRpZmllciA9PT0gIlUrMDA1QSIpICAvLyBa IGtleQorCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5ldmVudEhh c0N0cmxPck1ldGEoZXZlbnQpICYmIGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJVKzAwNUEiKSB7 IC8vIFoga2V5CiAgICAgICAgICAgICBET01BZ2VudC51bmRvKHRoaXMuX3VwZGF0ZVNpZGViYXJz LmJpbmQodGhpcykpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAg dGhpcy50cmVlT3V0bGluZS5oYW5kbGVTaG9ydGN1dChldmVudCk7CiAgICAgfSwKIAogICAgIGhh bmRsZUNvcHlFdmVudDogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggMDhl ZTFkYWNkZjM2NGM1ZTNjYThmY2I0OGM4ZTBmOGE0MmQwZDYyMi4uZGM4YmQ3Njc0NDgwZmI3YTI3 NjVhMGEwOGRlMzNhNTVlNTY5NTY5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtMzI5LDcgKzMy OSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZSA9IHsKIAog ICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuc2V0RGF0YSgidGV4dC9wbGFpbiIsIHRyZWVFbGVt ZW50Lmxpc3RJdGVtRWxlbWVudC50ZXh0Q29udGVudCk7CiAgICAgICAgIGV2ZW50LmRhdGFUcmFu c2Zlci5lZmZlY3RBbGxvd2VkID0gImNvcHlNb3ZlIjsKLSAgICAgICAgdGhpcy5fbm9kZUJlaW5n RHJhZ2dlZCA9IHRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0OworICAgICAgICB0aGlzLl90 cmVlRWxlbWVudEJlaW5nRHJhZ2dlZCA9IHRyZWVFbGVtZW50OwogCiAgICAgICAgIFdlYkluc3Bl Y3Rvci5kb21BZ2VudC5oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOwogCkBAIC0zMzgsNyArMzM4LDcg QEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogCiAgICAg X29uZHJhZ292ZXI6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9u b2RlQmVpbmdEcmFnZ2VkKQorICAgICAgICBpZiAoIXRoaXMuX3RyZWVFbGVtZW50QmVpbmdEcmFn Z2VkKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIHZhciB0cmVlRWxlbWVu dCA9IHRoaXMuX3RyZWVFbGVtZW50RnJvbUV2ZW50KGV2ZW50KTsKQEAgLTM0Nyw3ICszNDcsNyBA QCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgdmFyIG5vZGUgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKICAgICAgICAgd2hp bGUgKG5vZGUpIHsKLSAgICAgICAgICAgIGlmIChub2RlID09PSB0aGlzLl9ub2RlQmVpbmdEcmFn Z2VkKQorICAgICAgICAgICAgaWYgKG5vZGUgPT09IHRoaXMuX3RyZWVFbGVtZW50QmVpbmdEcmFn Z2VkLnJlcHJlc2VudGVkT2JqZWN0KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICAgICAgICAgIG5vZGUgPSBub2RlLnBhcmVudE5vZGU7CiAgICAgICAgIH0KQEAgLTM5Miw3ICsz OTIsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUgPSB7CiAK ICAgICBfZG9Nb3ZlOiBmdW5jdGlvbih0cmVlRWxlbWVudCkKICAgICB7Ci0gICAgICAgIGlmICgh dGhpcy5fbm9kZUJlaW5nRHJhZ2dlZCkKKyAgICAgICAgaWYgKCF0aGlzLl90cmVlRWxlbWVudEJl aW5nRHJhZ2dlZCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2YXIgcGFyZW50Tm9k ZTsKQEAgLTQwNywyNyArNDA3LDE3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5l LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGFuY2hvck5vZGUgPSBkcmFnVGFyZ2V0Tm9kZTsK ICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGVycm9yLCBuZXdOb2RlSWQp Ci0gICAgICAgIHsKLSAgICAgICAgICAgIGlmIChlcnJvcikKLSAgICAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIHZhciB3YXNFeHBhbmRlZCA9IHRoaXMuX3RyZWVFbGVtZW50QmVpbmdEcmFn Z2VkLmV4cGFuZGVkOworICAgICAgICB0aGlzLl90cmVlRWxlbWVudEJlaW5nRHJhZ2dlZC5yZXBy ZXNlbnRlZE9iamVjdC5tb3ZlVG8ocGFyZW50Tm9kZSwgYW5jaG9yTm9kZSwgdGhpcy5fc2VsZWN0 Tm9kZUFmdGVyRWRpdC5iaW5kKHRoaXMsIG51bGwsIHdhc0V4cGFuZGVkKSk7CiAKLSAgICAgICAg ICAgIHRoaXMuX3VwZGF0ZU1vZGlmaWVkTm9kZXMoKTsKLSAgICAgICAgICAgIHZhciBuZXdOb2Rl ID0gV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm5vZGVGb3JJZChuZXdOb2RlSWQpOwotICAgICAgICAg ICAgaWYgKG5ld05vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5zZWxlY3RET01Ob2RlKG5ld05v ZGUsIHRydWUpOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fbm9kZUJlaW5nRHJhZ2dlZC5t b3ZlVG8ocGFyZW50Tm9kZSwgYW5jaG9yTm9kZSwgY2FsbGJhY2suYmluZCh0aGlzKSk7Ci0KLSAg ICAgICAgZGVsZXRlIHRoaXMuX25vZGVCZWluZ0RyYWdnZWQ7CisgICAgICAgIGRlbGV0ZSB0aGlz Ll90cmVlRWxlbWVudEJlaW5nRHJhZ2dlZDsKICAgICB9LAogCiAgICAgX29uZHJhZ2VuZDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAg ICAgICB0aGlzLl9jbGVhckRyYWdPdmVyVHJlZUVsZW1lbnRNYXJrZXIoKTsKLSAgICAgICAgZGVs ZXRlIHRoaXMuX25vZGVCZWluZ0RyYWdnZWQ7CisgICAgICAgIGRlbGV0ZSB0aGlzLl90cmVlRWxl bWVudEJlaW5nRHJhZ2dlZDsKICAgICB9LAogCiAgICAgX2NsZWFyRHJhZ092ZXJUcmVlRWxlbWVu dE1hcmtlcjogZnVuY3Rpb24oKQpAQCAtNTAxLDYgKzQ5MSw2NSBAQCBXZWJJbnNwZWN0b3IuRWxl bWVudHNUcmVlT3V0bGluZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAodGhpcy5f Y29udGV4dE1lbnVDYWxsYmFjaykKICAgICAgICAgICAgIHRoaXMuX2NvbnRleHRNZW51Q2FsbGJh Y2soY29udGV4dE1lbnUsIG5vZGUpOworICAgIH0sCisKKyAgICBoYW5kbGVTaG9ydGN1dDogZnVu Y3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgbm9kZSA9IHRoaXMuc2VsZWN0ZWRET01O b2RlKCk7CisgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXMuZ2V0Q2FjaGVkVHJlZUVsZW1l bnQobm9kZSk7CisgICAgICAgIGlmICghbm9kZSB8fCAhdHJlZUVsZW1lbnQpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJGMiIpIHsK KyAgICAgICAgICAgIHRoaXMuX3RvZ2dsZUVkaXRBc0hUTUwobm9kZSk7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuZXZlbnRIYXNDdHJsT3JNZXRhKGV2ZW50KSkgeworICAgICAgICAgICAgaWYgKGV2ZW50 LmtleUlkZW50aWZpZXIgPT09ICJVcCIgJiYgbm9kZS5wcmV2aW91c1NpYmxpbmcgJiYgbm9kZS5w YXJlbnROb2RlKSB7CisgICAgICAgICAgICAgICAgbm9kZS5tb3ZlVG8obm9kZS5wYXJlbnROb2Rl LCBub2RlLnByZXZpb3VzU2libGluZywgdGhpcy5fc2VsZWN0Tm9kZUFmdGVyRWRpdC5iaW5kKHRo aXMsIG51bGwsIHRyZWVFbGVtZW50LmV4cGFuZGVkKSk7CisgICAgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIgPT09 ICJEb3duIiAmJiBub2RlLm5leHRTaWJsaW5nICYmIG5vZGUucGFyZW50Tm9kZSkgeworICAgICAg ICAgICAgICAgIG5vZGUubW92ZVRvKG5vZGUucGFyZW50Tm9kZSwgbm9kZS5uZXh0U2libGluZy5u ZXh0U2libGluZywgdGhpcy5fc2VsZWN0Tm9kZUFmdGVyRWRpdC5iaW5kKHRoaXMsIG51bGwsIHRy ZWVFbGVtZW50LmV4cGFuZGVkKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg ICAgfQorICAgICAgICB9CisKKyAgICB9LAorCisgICAgX3RvZ2dsZUVkaXRBc0hUTUw6IGZ1bmN0 aW9uKG5vZGUpCisgICAgeworICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLmdldENhY2hl ZFRyZWVFbGVtZW50KG5vZGUpOworICAgICAgICBpZiAoIXRyZWVFbGVtZW50KQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIGlmICh0cmVlRWxlbWVudC5fZWRpdGluZyAmJiB0cmVlRWxl bWVudC5faHRtbEVkaXRFbGVtZW50ICYmIFdlYkluc3BlY3Rvci5pc0JlaW5nRWRpdGVkKHRyZWVF bGVtZW50Ll9odG1sRWRpdEVsZW1lbnQpKQorICAgICAgICAgICAgdHJlZUVsZW1lbnQuX2VkaXRp bmcuY29tbWl0KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRyZWVFbGVtZW50Ll9lZGl0 QXNIVE1MKCk7CisgICAgfSwKKworICAgIF9zZWxlY3ROb2RlQWZ0ZXJFZGl0OiBmdW5jdGlvbihm YWxsYmFja05vZGUsIHdhc0V4cGFuZGVkLCBlcnJvciwgbm9kZUlkKQorICAgIHsKKyAgICAgICAg aWYgKGVycm9yKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIFNlbGVjdCBpdCBh bmQgZXhwYW5kIGlmIG5lY2Vzc2FyeS4gV2UgZm9yY2UgdHJlZSB1cGRhdGUgc28gdGhhdCBpdCBw cm9jZXNzZXMgZG9tIGV2ZW50cyBhbmQgaXMgdXAgdG8gZGF0ZS4KKyAgICAgICAgdGhpcy5fdXBk YXRlTW9kaWZpZWROb2RlcygpOworCisgICAgICAgIHZhciBuZXdOb2RlID0gV2ViSW5zcGVjdG9y LmRvbUFnZW50Lm5vZGVGb3JJZChub2RlSWQpIHx8IGZhbGxiYWNrTm9kZTsKKyAgICAgICAgaWYg KCFuZXdOb2RlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuc2VsZWN0RE9N Tm9kZShuZXdOb2RlLCB0cnVlKTsKKworICAgICAgICB2YXIgbmV3VHJlZUl0ZW0gPSB0aGlzLmZp bmRUcmVlRWxlbWVudChuZXdOb2RlKTsKKyAgICAgICAgaWYgKHdhc0V4cGFuZGVkKSB7CisgICAg ICAgICAgICBpZiAobmV3VHJlZUl0ZW0pCisgICAgICAgICAgICAgICAgbmV3VHJlZUl0ZW0uZXhw YW5kKCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIG5ld1RyZWVJdGVtOwogICAgIH0KIH0K IApAQCAtMTI2Myw3ICsxMzEyLDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQu cHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIGNvbW1pdCgpCiAgICAgICAgIHsKLSAg ICAgICAgICAgIGNvbW1pdENhbGxiYWNrKHRoaXMuX2h0bWxFZGl0RWxlbWVudC50ZXh0Q29udGVu dCk7CisgICAgICAgICAgICBjb21taXRDYWxsYmFjayhpbml0aWFsVmFsdWUsIHRoaXMuX2h0bWxF ZGl0RWxlbWVudC50ZXh0Q29udGVudCk7CiAgICAgICAgICAgICBkaXNwb3NlLmNhbGwodGhpcyk7 CiAgICAgICAgIH0KIApAQCAtMTM5OSwxNyArMTQ0OCw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50 c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBjYW5jZWwoKTsKICAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIHZhciBu b2RlID0gV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm5vZGVGb3JJZChub2RlSWQpOwotCi0gICAgICAg ICAgICAvLyBTZWxlY3QgaXQgYW5kIGV4cGFuZCBpZiBuZWNlc3NhcnkuIFdlIGZvcmNlIHRyZWUg dXBkYXRlIHNvIHRoYXQgaXQgcHJvY2Vzc2VzIGRvbSBldmVudHMgYW5kIGlzIHVwIHRvIGRhdGUu Ci0gICAgICAgICAgICB0cmVlT3V0bGluZS5fdXBkYXRlTW9kaWZpZWROb2RlcygpOwotICAgICAg ICAgICAgdHJlZU91dGxpbmUuc2VsZWN0RE9NTm9kZShub2RlLCB0cnVlKTsKLQotICAgICAgICAg ICAgdmFyIG5ld1RyZWVJdGVtID0gdHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KG5vZGUpOwot ICAgICAgICAgICAgaWYgKHdhc0V4cGFuZGVkKQotICAgICAgICAgICAgICAgIG5ld1RyZWVJdGVt LmV4cGFuZCgpOwotCisgICAgICAgICAgICB2YXIgbmV3VHJlZUl0ZW0gPSB0cmVlT3V0bGluZS5f c2VsZWN0Tm9kZUFmdGVyRWRpdChudWxsLCB3YXNFeHBhbmRlZCwgZXJyb3IsIG5vZGVJZCk7CiAg ICAgICAgICAgICBtb3ZlVG9OZXh0QXR0cmlidXRlSWZOZWVkZWQuY2FsbChuZXdUcmVlSXRlbSk7 CiAgICAgICAgIH0KIApAQCAtMTY4NSw2ICsxNzI0LDggQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRz VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgcGFyZW50RWxlbWVudC5hZGp1 c3RDb2xsYXBzZWRSYW5nZSgpOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKCF0aGlzLnJlcHJl c2VudGVkT2JqZWN0LnBhcmVudE5vZGUgfHwgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5wYXJlbnRO b2RlLm5vZGVUeXBlKCkgPT0gTm9kZS5ET0NVTUVOVF9OT0RFKQorICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LnJlbW92ZU5vZGUocmVtb3ZlTm9kZUNh bGxiYWNrKTsKICAgICB9LAogCkBAIC0xNzE3LDkgKzE3NTgsMTIgQEAgV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAgICB9 CiAKLSAgICAgICAgZnVuY3Rpb24gY29tbWl0Q2hhbmdlKHZhbHVlKQorICAgICAgICBmdW5jdGlv biBjb21taXRDaGFuZ2UoaW5pdGlhbFZhbHVlLCB2YWx1ZSkKICAgICAgICAgewotICAgICAgICAg ICAgbm9kZS5zZXRPdXRlckhUTUwodmFsdWUsIHNlbGVjdE5vZGUpOworICAgICAgICAgICAgaWYg KGluaXRpYWxWYWx1ZSAhPSB2YWx1ZSkKKyAgICAgICAgICAgICAgICBub2RlLnNldE91dGVySFRN TCh2YWx1ZSwgc2VsZWN0Tm9kZSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgbm9kZS5nZXRPdXRlckhUTUwodGhpcy5fc3Rh cnRFZGl0aW5nQXNIVE1MLmJpbmQodGhpcywgY29tbWl0Q2hhbmdlKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMKaW5kZXggZTYyNTM1ZDhkNWQxN2Ex M2NiZjExNThkMTkxNDgzZDJkZmUxYTk2Mi4uMGUyNjg2MzRlZmY0OWJlZDI3ZDY1YjI5Y2ViNWY0 NWI4Y2U5M2VkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9VSVV0aWxzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlV dGlscy5qcwpAQCAtMjY4LDcgKzI2OCw3IEBAIFdlYkluc3BlY3Rvci5FZGl0aW5nQ29uZmlnLnBy b3RvdHlwZSA9IHsKIFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcgPSBmdW5jdGlvbihlbGVtZW50 LCBjb25maWcpCiB7CiAgICAgaWYgKCFXZWJJbnNwZWN0b3IubWFya0JlaW5nRWRpdGVkKGVsZW1l bnQsIHRydWUpKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBudWxsOwogCiAgICAg Y29uZmlnID0gY29uZmlnIHx8IG5ldyBXZWJJbnNwZWN0b3IuRWRpdGluZ0NvbmZpZyhmdW5jdGlv bigpIHt9LCBmdW5jdGlvbigpIHt9KTsKICAgICB2YXIgY29tbWl0dGVkQ2FsbGJhY2sgPSBjb25m aWcuY29tbWl0SGFuZGxlcjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3ZDkyNzM5NmZjOGJjMGNkNDFiODQxNzE1ZGNiYzVh ZjY0NTkxMjNjLi5kMzFmYjUxMjliMTNmNWZhZTMzNWM4MTExOGE5MzVkZjNiZjY3MmUzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMTYgQEAKIDIwMTItMDItMDggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBn b29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHRvZ2dsZSBFZGl0IGFzIEhUTUwg b24gRjIsIGRyYWcgbm9kZXMgdXAgLyBkb3duIHVwb24gQ3RybChDbWQpIFVwIC8gRG93bi4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4MTIzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZWxlbWVudHMvbW92ZS1ub2RlLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL3Vu ZG8tZG9tLWVkaXRzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZWxlbWVudHMv dW5kby1kb20tZWRpdHMuaHRtbDoKKworMjAxMi0wMi0wOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxk bWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogYmluZCBlbnRpcmUgc3Vi dHJlZSB1cG9uIGNoaWxkTm9kZUluc2VydGVkIHNvIHRoYXQgdGV4dCBub2RlIHdlcmUgYWNjb3Vu dGVkLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzgx MTYKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL21vdmUtbm9k ZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL21vdmUtbm9kZS5odG1sCmlu ZGV4IDM3NmU0NTYzYjk0NDM4YTJkYjNhMzUzZTMwOTFjNDQ4M2NhMDZmZmQuLjBkMzVlZTA3MTUz YTViNWVhOGM1OTc3M2I1MWM3MjM5NWQ2MjA3MWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9lbGVtZW50cy9tb3ZlLW5vZGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZWxlbWVudHMvbW92ZS1ub2RlLmh0bWwKQEAgLTM1LDcgKzM1LDcgQEAgZnVuY3Rpb24gdGVz dCgpCiAgICAgICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAg ICB0cmVlT3V0bGluZS5fbm9kZUJlaW5nRHJhZ2dlZCA9IEluc3BlY3RvclRlc3QuZXhwYW5kZWRO b2RlV2l0aElkKCJjaGlsZDIiKTsKKyAgICAgICAgICAgIHRyZWVPdXRsaW5lLl90cmVlRWxlbWVu dEJlaW5nRHJhZ2dlZCA9IHRyZWVPdXRsaW5lLmdldENhY2hlZFRyZWVFbGVtZW50KEluc3BlY3Rv clRlc3QuZXhwYW5kZWROb2RlV2l0aElkKCJjaGlsZDIiKSk7CiAgICAgICAgICAgICB2YXIgdHJl ZUVsZW1lbnRUb0Ryb3BPbiA9IHRyZWVPdXRsaW5lLmdldENhY2hlZFRyZWVFbGVtZW50KEluc3Bl Y3RvclRlc3QuZXhwYW5kZWROb2RlV2l0aElkKCJjaGlsZDQiKSk7CiAgICAgICAgICAgICB0cmVl T3V0bGluZS5fZG9Nb3ZlKHRyZWVFbGVtZW50VG9Ecm9wT24pOwogICAgICAgICB9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvdW5kby1kb20tZWRpdHMtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3VuZG8tZG9tLWVkaXRzLWV4 cGVjdGVkLnR4dAppbmRleCA5YTYxYjczOTIyNjk5MDUxNGUwNzgwNmRhYTE5NDgwZjVkN2RkNGY1 Li5mNjdmYjNjYzI0MzBkZjllOTQ3M2E3YTlmMzMxNTAxNjE3YzA2YmJjIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvdW5kby1kb20tZWRpdHMtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy91bmRvLWRvbS1lZGl0cy1leHBl Y3RlZC50eHQKQEAgLTUzLDE0ICs1MywxMSBAQCBJbml0aWFsOgogICA8L2Rpdj4KIFBvc3QtYWN0 aW9uOgogLSA8ZGl2IGlkPSJ0ZXN0RWRpdEFzSFRNTCI+Ci0gICAgLSA8ZGl2IGlkPSJub2RlLXRv LWVkaXQtYXMtaHRtbCI+Ci0gICAgICAgICAgPGRpdiBpZD0ic3BhbjIiPlRleHQyPC9kaXY+Ci0g ICAgICA8L2Rpdj4KKyAgICArIDxkaXYgaWQ9Im5vZGUtdG8tZWRpdC1hcy1odG1sIj7igKY8L2Rp dj4KKyAgICAgIDxzcGFuPlNlY29uZCBub2RlPC9zcGFuPgogICA8L2Rpdj4KIFBvc3QtdW5kbyAo aW5pdGlhbCk6CiAtIDxkaXYgaWQ9InRlc3RFZGl0QXNIVE1MIj4KLSAgICAtIDxkaXYgaWQ9Im5v ZGUtdG8tZWRpdC1hcy1odG1sIj4KLSAgICAgICAgICA8c3BhbiBpZD0ic3BhbiI+VGV4dDwvc3Bh bj4KLSAgICAgIDwvZGl2PgorICAgICsgPGRpdiBpZD0ibm9kZS10by1lZGl0LWFzLWh0bWwiPjwv ZGl2PgogICA8L2Rpdj4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1l bnRzL3VuZG8tZG9tLWVkaXRzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMv dW5kby1kb20tZWRpdHMuaHRtbAppbmRleCBlYmQ5MmRlNjA1NzQ1ODQxNTEzZmYzNTU4NWVkMjAz YjZiNTNlNTU1Li4xYzA2MmM0YmU4NTIzN2I5ZDY1MGRlOGMzZDQwMDNjNzEzNWY0NWJmIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvdW5kby1kb20tZWRpdHMuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvdW5kby1kb20tZWRpdHMuaHRt bApAQCAtNDEsMTEgKzQxLDEwIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIGZ1bmN0aW9uIHRlc3RF ZGl0QXNIVE1MKGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgdmFyIG5vZGUgPSBJbnNwZWN0b3JU ZXN0LmV4cGFuZGVkTm9kZVdpdGhJZCgibm9kZS10by1lZGl0LWFzLWh0bWwiKTsgCi0gICAgICAg IG5vZGUuc2V0T3V0ZXJIVE1MKCI8ZGl2IGlkPVwibm9kZS10by1lZGl0LWFzLWh0bWxcIj48ZGl2 IGlkPVwic3BhbjJcIj5UZXh0MjwvZGl2PjwvZGl2PiIsIGNhbGxiYWNrKTsKKyAgICAgICAgbm9k ZS5zZXRPdXRlckhUTUwoIjxkaXYgaWQ9XCJub2RlLXRvLWVkaXQtYXMtaHRtbFwiPjxkaXYgaWQ9 XCJzcGFuMlwiPlRleHQyPC9kaXY+PC9kaXY+PHNwYW4+U2Vjb25kIG5vZGU8L3NwYW4+IiwgY2Fs bGJhY2spOwogICAgIH0KICAgICB0ZXN0U3VpdGUucHVzaChJbnNwZWN0b3JUZXN0LmdlbmVyYXRl VW5kb1Rlc3QodGVzdEVkaXRBc0hUTUwpKTsKIAotCiAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0 U3VpdGUodGVzdFN1aXRlKTsKIH0KIAo=