52215 2011-01-11 08:44:21 -0800 Web Inspector: breakpoint text snippet in breakpoints sidebar pane disappears after reload 2011-01-14 07:58:53 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 332360 0 podivilov 2011-01-11 08:44:21 -0800 Web Inspector: breakpoint text snippet in breakpoints sidebar pane disappears after reload 332361 1 78534 podivilov 2011-01-11 08:45:02 -0800 Created attachment 78534 Patch. 334205 2 78534 yurys 2011-01-14 02:22:56 -0800 Comment on attachment 78534 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=78534&action=review > Source/WebCore/inspector/front-end/Breakpoint.js:90 > + function gotSourceLine(text) in WebKit didGet... naming style is used > Source/WebCore/inspector/front-end/Script.js:60 > +WebInspector.Script.findLineEndings = function(source) This should be declared in utilities.js, maybe on String.prototype > Source/WebCore/inspector/front-end/Script.js:82 > + findLineEndings: function(callback) this method should be private > Source/WebCore/inspector/front-end/Script.js:123 > + function gotScriptSource(source) in WebKit didGet... naming style is used > Source/WebCore/inspector/front-end/Script.js:127 > + for (var i = 0; i < this.startingLine - 1; ++i) why do you need this? > Source/WebCore/inspector/front-end/Script.js:131 looks like you need to add this message to localizedStrings.js 334241 3 78925 podivilov 2011-01-14 05:00:16 -0800 Created attachment 78925 Comments addressed. 334304 4 podivilov 2011-01-14 07:58:53 -0800 Committed r75795: <http://trac.webkit.org/changeset/75795> 78534 2011-01-11 08:45:02 -0800 2011-01-14 05:00:16 -0800 Patch. patch text/plain 7083 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwNDQxZWI4Li5lYmIxYjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTEtMDEtMTEgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogYnJlYWtwb2ludCB0ZXh0IHNuaXBwZXQgaW4gYnJlYWtwb2ludHMgc2lkZWJhciBw YW5lIGRpc2FwcGVhcnMgYWZ0ZXIgcmVsb2FkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIyMTUKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvQnJlYWtwb2ludC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZS5wb3B1bGF0ZUxhYmVsRWxl bWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0LmZpbmRMaW5lRW5kaW5ncyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5nZXQgbGluZXNDb3VudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5maW5kTGluZUVuZGluZ3MuZGlkUmVxdWVzdFNvdXJjZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5maW5kTGluZUVuZGluZ3Mp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUuc291cmNlTGluZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5zZXQgc291cmNlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlLnJlcXVlc3RTb3VyY2UuZ290U2NyaXB0 U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlLnJlcXVlc3RT b3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9hZGRCcmVha3BvaW50 KToKKworMjAxMS0wMS0xMSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9y Zz4KKwogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IHJlY3JlYXRlIHNjcmlwdCB2aWV3IGFmdGVyIGxpdmUgZWRpdC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludC5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludC5qcwppbmRleCAwYTg4 OGQyLi45Yzg3Y2Y4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0JyZWFrcG9pbnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9CcmVha3BvaW50LmpzCkBAIC0zNyw3ICszNyw2IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50 ID0gZnVuY3Rpb24oZGVidWdnZXJNb2RlbCwgYnJlYWtwb2ludElkLCBzb3VyY2VJRCwgdXJsLCBs CiAgICAgdGhpcy5zb3VyY2VJRCA9IHNvdXJjZUlEOwogICAgIHRoaXMuX2VuYWJsZWQgPSBlbmFi bGVkOwogICAgIHRoaXMuX2NvbmRpdGlvbiA9IGNvbmRpdGlvbiB8fCAiIjsKLSAgICB0aGlzLl9z b3VyY2VUZXh0ID0gIiI7CiAgICAgdGhpcy5faGl0ID0gZmFsc2U7CiAgICAgdGhpcy5fZGVidWdn ZXJNb2RlbCA9IGRlYnVnZ2VyTW9kZWw7CiB9CkBAIC01NiwxNyArNTUsNiBAQCBXZWJJbnNwZWN0 b3IuQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLnNldEJyZWFrcG9pbnQodGhpcy5zb3VyY2VJRCwgdGhpcy5saW5lLCBlbmFibGVkLCB0 aGlzLmNvbmRpdGlvbik7CiAgICAgfSwKIAotICAgIGdldCBzb3VyY2VUZXh0KCkKLSAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VUZXh0OwotICAgIH0sCi0KLSAgICBzZXQgc291cmNl VGV4dCh0ZXh0KQotICAgIHsKLSAgICAgICAgdGhpcy5fc291cmNlVGV4dCA9IHRleHQ7Ci0gICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJsYWJlbC1jaGFuZ2VkIik7Ci0gICAg fSwKLQogICAgIGdldCBjb25kaXRpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2Nv bmRpdGlvbjsKQEAgLTk5LDE0ICs4NywxOSBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5wcm90 b3R5cGUgPSB7CiAKICAgICBwb3B1bGF0ZUxhYmVsRWxlbWVudDogZnVuY3Rpb24oZWxlbWVudCkK ICAgICB7Ci0gICAgICAgIHZhciBkaXNwbGF5TmFtZSA9IHRoaXMudXJsID8gV2ViSW5zcGVjdG9y LmRpc3BsYXlOYW1lRm9yVVJMKHRoaXMudXJsKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHBy b2dyYW0pIik7Ci0gICAgICAgIHZhciBsYWJlbEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVUZXh0 Tm9kZShkaXNwbGF5TmFtZSArICI6IiArIHRoaXMubGluZSk7Ci0gICAgICAgIGVsZW1lbnQuYXBw ZW5kQ2hpbGQobGFiZWxFbGVtZW50KTsKKyAgICAgICAgZnVuY3Rpb24gZ290U291cmNlTGluZSh0 ZXh0KQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgZGlzcGxheU5hbWUgPSB0aGlzLnVybCA/ IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCh0aGlzLnVybCkgOiBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIihwcm9ncmFtKSIpOworICAgICAgICAgICAgdmFyIGxhYmVsRWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKGRpc3BsYXlOYW1lICsgIjoiICsgdGhpcy5saW5lKTsKKyAg ICAgICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQobGFiZWxFbGVtZW50KTsKIAotICAgICAgICB2 YXIgc291cmNlVGV4dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAg ICAgICAgc291cmNlVGV4dEVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlzLnNvdXJjZVRleHQ7Ci0g ICAgICAgIHNvdXJjZVRleHRFbGVtZW50LmNsYXNzTmFtZSA9ICJzb3VyY2UtdGV4dCBtb25vc3Bh Y2UiOwotICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxkKHNvdXJjZVRleHRFbGVtZW50KTsKKyAg ICAgICAgICAgIHZhciBzb3VyY2VUZXh0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOworICAgICAgICAgICAgc291cmNlVGV4dEVsZW1lbnQudGV4dENvbnRlbnQgPSB0ZXh0 OworICAgICAgICAgICAgc291cmNlVGV4dEVsZW1lbnQuY2xhc3NOYW1lID0gInNvdXJjZS10ZXh0 IG1vbm9zcGFjZSI7CisgICAgICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxkKHNvdXJjZVRleHRF bGVtZW50KTsKKyAgICAgICAgfQorICAgICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fZGVidWdnZXJN b2RlbC5zY3JpcHRGb3JTb3VyY2VJRCh0aGlzLnNvdXJjZUlEKTsKKyAgICAgICAgc2NyaXB0LnNv dXJjZUxpbmUodGhpcy5saW5lLCBnb3RTb3VyY2VMaW5lLmJpbmQodGhpcykpOwogICAgIH0sCiAK ICAgICByZW1vdmU6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHQuanMKaW5kZXggNTI3ZGQ5ZC4uNzNhZTUzYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKQEAgLTU3LDIwICs1Nyw1MCBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0LldvcmxkVHlwZSA9IHsKICAgICBFWFRFTlNJT05TX1dPUkxEOiAxCiB9 CiAKK1dlYkluc3BlY3Rvci5TY3JpcHQuZmluZExpbmVFbmRpbmdzID0gZnVuY3Rpb24oc291cmNl KQoreworICAgIHZhciBsaW5lRW5kaW5ncyA9IFtdOworICAgIHZhciBpID0gc291cmNlLmluZGV4 T2YoIlxuIik7CisgICAgd2hpbGUgKGkgIT09IC0xKSB7CisgICAgICAgIGxpbmVFbmRpbmdzLnB1 c2goaSk7CisgICAgICAgIGkgPSBzb3VyY2UuaW5kZXhPZigiXG4iLCBpICsgMSk7CisgICAgfQor ICAgIGxpbmVFbmRpbmdzLnB1c2goc291cmNlLmxlbmd0aCk7CisgICAgcmV0dXJuIGxpbmVFbmRp bmdzOworfQorCiBXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICBnZXQgbGlu ZXNDb3VudCgpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuc291cmNlKQogICAgICAgICAgICAg cmV0dXJuIDA7Ci0gICAgICAgIGlmICh0aGlzLl9saW5lc0NvdW50KQotICAgICAgICAgICAgcmV0 dXJuIHRoaXMuX2xpbmVzQ291bnQ7Ci0gICAgICAgIHRoaXMuX2xpbmVzQ291bnQgPSAwOwotICAg ICAgICB2YXIgbGFzdEluZGV4ID0gdGhpcy5zb3VyY2UuaW5kZXhPZigiXG4iKTsKLSAgICAgICAg d2hpbGUgKGxhc3RJbmRleCAhPT0gLTEpIHsKLSAgICAgICAgICAgIGxhc3RJbmRleCA9IHRoaXMu c291cmNlLmluZGV4T2YoIlxuIiwgbGFzdEluZGV4ICsgMSkKLSAgICAgICAgICAgIHRoaXMuX2xp bmVzQ291bnQrKzsKKyAgICAgICAgaWYgKCF0aGlzLl9saW5lRW5kaW5ncykKKyAgICAgICAgICAg IHRoaXMuX2xpbmVFbmRpbmdzID0gV2ViSW5zcGVjdG9yLlNjcmlwdC5maW5kTGluZUVuZGluZ3Mo dGhpcy5fc291cmNlKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2xpbmVFbmRpbmdzLmxlbmd0aDsK KyAgICB9LAorCisgICAgZmluZExpbmVFbmRpbmdzOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7 CisgICAgICAgIGlmICh0aGlzLl9saW5lRW5kaW5ncykgeworICAgICAgICAgICAgY2FsbGJhY2so dGhpcy5fbGluZUVuZGluZ3MpOworICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAg ICAgIHJldHVybiB0aGlzLl9saW5lc0NvdW50OworCisgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVl c3RTb3VyY2UoKQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLl9saW5lRW5kaW5ncyA9IFdl Ykluc3BlY3Rvci5TY3JpcHQuZmluZExpbmVFbmRpbmdzKHRoaXMuX3NvdXJjZSk7CisgICAgICAg ICAgICBjYWxsYmFjayh0aGlzLl9saW5lRW5kaW5ncykKKyAgICAgICAgfQorICAgICAgICB0aGlz LnJlcXVlc3RTb3VyY2UoZGlkUmVxdWVzdFNvdXJjZS5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisg ICAgc291cmNlTGluZTogZnVuY3Rpb24obGluZU51bWJlciwgY2FsbGJhY2spCisgICAgeworICAg ICAgICBmdW5jdGlvbiBkaWRGaW5kTGluZUVuZGluZ3MoKQorICAgICAgICB7CisgICAgICAgICAg ICBjYWxsYmFjayh0aGlzLl9zb3VyY2Uuc3Vic3RyaW5nKHRoaXMuX2xpbmVFbmRpbmdzW2xpbmVO dW1iZXIgLSAyXSwgdGhpcy5fbGluZUVuZGluZ3NbbGluZU51bWJlciAtIDFdKSk7CisgICAgICAg IH0KKyAgICAgICAgdGhpcy5maW5kTGluZUVuZGluZ3MoZGlkRmluZExpbmVFbmRpbmdzLmJpbmQo dGhpcykpOwogICAgIH0sCiAKICAgICBnZXQgc291cmNlKCkKQEAgLTgxLDUgKzExMSwyNiBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICBzZXQgc291cmNlKHNvdXJjZSkK ICAgICB7CiAgICAgICAgIHRoaXMuX3NvdXJjZSA9IHNvdXJjZTsKKyAgICB9LAorCisgICAgcmVx dWVzdFNvdXJjZTogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICBpZiAodGhpcy5f c291cmNlKSB7CisgICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9zb3VyY2UpOworICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gZ290U2NyaXB0U291cmNl KHNvdXJjZSkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHNvdXJjZSkgeworICAgICAgICAg ICAgICAgIHZhciBwcmVmaXggPSAiIjsKKyAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IHRoaXMuc3RhcnRpbmdMaW5lIC0gMTsgKytpKQorICAgICAgICAgICAgICAgICAgICBwcmVm aXggKz0gIlxuIjsKKyAgICAgICAgICAgICAgICB0aGlzLl9zb3VyY2UgPSBwcmVmaXggKyBzb3Vy Y2U7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICB0aGlzLl9zb3VyY2UgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIjxzb3VyY2UgaXMgbm90IGF2YWlsYWJsZT4iKTsKKyAgICAg ICAgICAgIGNhbGxiYWNrKHRoaXMuX3NvdXJjZSk7CisgICAgICAgIH0KKyAgICAgICAgSW5zcGVj dG9yQmFja2VuZC5nZXRTY3JpcHRTb3VyY2UodGhpcy5zb3VyY2VJRCwgZ290U2NyaXB0U291cmNl LmJpbmQodGhpcykpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IDc0Y2M4NWMuLjMzZDRkOTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAt NDMxLDcgKzQzMSw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGJyZWFrcG9pbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29uZGl0aW9uLWNoYW5nZWQiLCB0 aGlzLl9icmVha3BvaW50Q2hhbmdlZCwgdGhpcyk7CiAgICAgICAgIGJyZWFrcG9pbnQuYWRkRXZl bnRMaXN0ZW5lcigicmVtb3ZlZCIsIHRoaXMuX2JyZWFrcG9pbnRSZW1vdmVkLCB0aGlzKTsKIAot ICAgICAgICBicmVha3BvaW50LnNvdXJjZVRleHQgPSB0aGlzLl90ZXh0TW9kZWwubGluZShicmVh a3BvaW50LmxpbmUgLSAxKTsKICAgICAgICAgdGhpcy5fc2V0QnJlYWtwb2ludERlY29yYXRpb24o YnJlYWtwb2ludC5saW5lLCBicmVha3BvaW50LmVuYWJsZWQsICEhYnJlYWtwb2ludC5jb25kaXRp b24pOwogICAgIH0sCiAK 78925 2011-01-14 05:00:16 -0800 2011-01-14 06:49:09 -0800 Comments addressed. patch text/plain 8483 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NjRjNTNjLi41YjUxMDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTEtMDEtMTQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogYnJlYWtwb2ludCB0ZXh0IHNuaXBwZXQgaW4gYnJlYWtwb2ludHMgc2lkZWJhciBw YW5lIGRpc2FwcGVhcnMgYWZ0ZXIgcmVsb2FkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIyMTUKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvQnJlYWtwb2ludC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZS5wb3B1bGF0ZUxhYmVsRWxl bWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5nZXQgbGluZXNDb3VudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5zb3VyY2VMaW5lKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlLnNvdXJjZUxpbmUuZGlkUmVxdWVzdFNvdXJjZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5zZXQgc291cmNlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlLnJlcXVlc3RTb3VyY2UuZGlkR2V0 U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlLnJl cXVlc3RTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRWaWV3LnByb3RvdHlwZS5zZXR1cFNvdXJj ZUZyYW1lSWZOZWVkZWQuZGlkUmVxdWVzdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2NyaXB0Vmlldy5wcm90b3R5cGUuc2V0dXBTb3VyY2VGcmFtZUlmTmVlZGVkKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fYWRkQnJlYWtwb2ludCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanM6CisgICAgICAgIChTdHJpbmcucHJvdG90eXBl LmZpbmRBbGwpOgorCiAyMDExLTAxLTEzICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBSb3dlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50LmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50LmpzCmluZGV4IDBhODg4ZDIuLmU1ZTE3Njgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2lu dC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnQu anMKQEAgLTM3LDcgKzM3LDYgQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQgPSBmdW5jdGlvbihk ZWJ1Z2dlck1vZGVsLCBicmVha3BvaW50SWQsIHNvdXJjZUlELCB1cmwsIGwKICAgICB0aGlzLnNv dXJjZUlEID0gc291cmNlSUQ7CiAgICAgdGhpcy5fZW5hYmxlZCA9IGVuYWJsZWQ7CiAgICAgdGhp cy5fY29uZGl0aW9uID0gY29uZGl0aW9uIHx8ICIiOwotICAgIHRoaXMuX3NvdXJjZVRleHQgPSAi IjsKICAgICB0aGlzLl9oaXQgPSBmYWxzZTsKICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsID0gZGVi dWdnZXJNb2RlbDsKIH0KQEAgLTU2LDE3ICs1NSw2IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2V0QnJl YWtwb2ludCh0aGlzLnNvdXJjZUlELCB0aGlzLmxpbmUsIGVuYWJsZWQsIHRoaXMuY29uZGl0aW9u KTsKICAgICB9LAogCi0gICAgZ2V0IHNvdXJjZVRleHQoKQotICAgIHsKLSAgICAgICAgcmV0dXJu IHRoaXMuX3NvdXJjZVRleHQ7Ci0gICAgfSwKLQotICAgIHNldCBzb3VyY2VUZXh0KHRleHQpCi0g ICAgewotICAgICAgICB0aGlzLl9zb3VyY2VUZXh0ID0gdGV4dDsKLSAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoImxhYmVsLWNoYW5nZWQiKTsKLSAgICB9LAotCiAgICAgZ2V0 IGNvbmRpdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fY29uZGl0aW9uOwpAQCAt OTksMTQgKzg3LDE5IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZSA9IHsKIAog ICAgIHBvcHVsYXRlTGFiZWxFbGVtZW50OiBmdW5jdGlvbihlbGVtZW50KQogICAgIHsKLSAgICAg ICAgdmFyIGRpc3BsYXlOYW1lID0gdGhpcy51cmwgPyBXZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVG b3JVUkwodGhpcy51cmwpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsKLSAg ICAgICAgdmFyIGxhYmVsRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKGRpc3BsYXlO YW1lICsgIjoiICsgdGhpcy5saW5lKTsKLSAgICAgICAgZWxlbWVudC5hcHBlbmRDaGlsZChsYWJl bEVsZW1lbnQpOworICAgICAgICBmdW5jdGlvbiBkaWRHZXRTb3VyY2VMaW5lKHRleHQpCisgICAg ICAgIHsKKyAgICAgICAgICAgIHZhciBkaXNwbGF5TmFtZSA9IHRoaXMudXJsID8gV2ViSW5zcGVj dG9yLmRpc3BsYXlOYW1lRm9yVVJMKHRoaXMudXJsKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygi KHByb2dyYW0pIik7CisgICAgICAgICAgICB2YXIgbGFiZWxFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlVGV4dE5vZGUoZGlzcGxheU5hbWUgKyAiOiIgKyB0aGlzLmxpbmUpOworICAgICAgICAgICAg ZWxlbWVudC5hcHBlbmRDaGlsZChsYWJlbEVsZW1lbnQpOwogCi0gICAgICAgIHZhciBzb3VyY2VU ZXh0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICBzb3Vy Y2VUZXh0RWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuc291cmNlVGV4dDsKLSAgICAgICAgc291 cmNlVGV4dEVsZW1lbnQuY2xhc3NOYW1lID0gInNvdXJjZS10ZXh0IG1vbm9zcGFjZSI7Ci0gICAg ICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQoc291cmNlVGV4dEVsZW1lbnQpOworICAgICAgICAgICAg dmFyIHNvdXJjZVRleHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Cisg ICAgICAgICAgICBzb3VyY2VUZXh0RWxlbWVudC50ZXh0Q29udGVudCA9IHRleHQ7CisgICAgICAg ICAgICBzb3VyY2VUZXh0RWxlbWVudC5jbGFzc05hbWUgPSAic291cmNlLXRleHQgbW9ub3NwYWNl IjsKKyAgICAgICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQoc291cmNlVGV4dEVsZW1lbnQpOwor ICAgICAgICB9CisgICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9kZWJ1Z2dlck1vZGVsLnNjcmlw dEZvclNvdXJjZUlEKHRoaXMuc291cmNlSUQpOworICAgICAgICBzY3JpcHQuc291cmNlTGluZSh0 aGlzLmxpbmUsIGRpZEdldFNvdXJjZUxpbmUuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIHJl bW92ZTogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdC5qcwppbmRleCA1MjdkZDlkLi43YTA2ZWI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwpAQCAtNjIsMTUgKzYyLDMwIEBAIFdlYkluc3BlY3Rv ci5TY3JpcHQucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLnNvdXJjZSkK ICAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICBpZiAodGhpcy5fbGluZXNDb3VudCkKLSAg ICAgICAgICAgIHJldHVybiB0aGlzLl9saW5lc0NvdW50OwotICAgICAgICB0aGlzLl9saW5lc0Nv dW50ID0gMDsKLSAgICAgICAgdmFyIGxhc3RJbmRleCA9IHRoaXMuc291cmNlLmluZGV4T2YoIlxu Iik7Ci0gICAgICAgIHdoaWxlIChsYXN0SW5kZXggIT09IC0xKSB7Ci0gICAgICAgICAgICBsYXN0 SW5kZXggPSB0aGlzLnNvdXJjZS5pbmRleE9mKCJcbiIsIGxhc3RJbmRleCArIDEpCi0gICAgICAg ICAgICB0aGlzLl9saW5lc0NvdW50Kys7CisgICAgICAgIGlmICghdGhpcy5fbGluZUVuZGluZ3Mp CisgICAgICAgICAgICB0aGlzLl9saW5lRW5kaW5ncyA9IHRoaXMuX3NvdXJjZS5maW5kQWxsKCJc biIpOworICAgICAgICByZXR1cm4gdGhpcy5fbGluZUVuZGluZ3MubGVuZ3RoICsgMTsKKyAgICB9 LAorCisgICAgc291cmNlTGluZTogZnVuY3Rpb24obGluZU51bWJlciwgY2FsbGJhY2spCisgICAg eworICAgICAgICBmdW5jdGlvbiBleHRyYWN0U291cmNlTGluZSgpCisgICAgICAgIHsKKyAgICAg ICAgICAgIGxpbmVOdW1iZXIgLT0gdGhpcy5zdGFydGluZ0xpbmU7CisgICAgICAgICAgICBjYWxs YmFjayh0aGlzLl9zb3VyY2Uuc3Vic3RyaW5nKHRoaXMuX2xpbmVFbmRpbmdzW2xpbmVOdW1iZXIg LSAxXSwgdGhpcy5fbGluZUVuZGluZ3NbbGluZU51bWJlcl0pKTsKKyAgICAgICAgfQorCisgICAg ICAgIGlmICh0aGlzLl9saW5lRW5kaW5ncykgeworICAgICAgICAgICAgZXh0cmFjdFNvdXJjZUxp bmUuY2FsbCh0aGlzKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAg IGZ1bmN0aW9uIGRpZFJlcXVlc3RTb3VyY2UoKQorICAgICAgICB7CisgICAgICAgICAgICB0aGlz Ll9saW5lRW5kaW5ncyA9IHRoaXMuX3NvdXJjZS5maW5kQWxsKCJcbiIpOworICAgICAgICAgICAg ZXh0cmFjdFNvdXJjZUxpbmUuY2FsbCh0aGlzKTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4g dGhpcy5fbGluZXNDb3VudDsKKyAgICAgICAgdGhpcy5yZXF1ZXN0U291cmNlKGRpZFJlcXVlc3RT b3VyY2UuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIGdldCBzb3VyY2UoKQpAQCAtODEsNSAr OTYsMjAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgc2V0IHNvdXJj ZShzb3VyY2UpCiAgICAgewogICAgICAgICB0aGlzLl9zb3VyY2UgPSBzb3VyY2U7CisgICAgfSwK KworICAgIHJlcXVlc3RTb3VyY2U6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAg aWYgKHRoaXMuX3NvdXJjZSkgeworICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fc291cmNlKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIGRpZEdl dFNjcmlwdFNvdXJjZShzb3VyY2UpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuX3NvdXJj ZSA9IHNvdXJjZTsKKyAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX3NvdXJjZSk7CisgICAgICAg IH0KKyAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5nZXRTY3JpcHRTb3VyY2UodGhpcy5zb3VyY2VJ RCwgZGlkR2V0U2NyaXB0U291cmNlLmJpbmQodGhpcykpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Vmlldy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Vmlldy5qcwppbmRleCBmMTM1NDc1 Li5lNDQxYTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdFZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRWaWV3LmpzCkBAIC01MywyMiArNTMsMTMgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFZpZXcu cHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuYXR0YWNoKCk7CiAKLSAgICAgICAgaWYgKHRo aXMuc2NyaXB0LnNvdXJjZSkKLSAgICAgICAgICAgIHRoaXMuX3NvdXJjZUZyYW1lU2V0dXBGaW5p c2hlZCgpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmdldFNj cmlwdFNvdXJjZSh0aGlzLnNjcmlwdC5zb3VyY2VJRCwgdGhpcy5fZGlkR2V0U2NyaXB0U291cmNl LmJpbmQodGhpcykpOwotICAgIH0sCi0KLSAgICBfZGlkR2V0U2NyaXB0U291cmNlOiBmdW5jdGlv bihzb3VyY2UpCi0gICAgewotICAgICAgICB0aGlzLnNjcmlwdC5zb3VyY2UgPSBzb3VyY2UgfHwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCI8c291cmNlIGlzIG5vdCBhdmFpbGFibGU+Iik7Ci0gICAg ICAgIHRoaXMuX3NvdXJjZUZyYW1lU2V0dXBGaW5pc2hlZCgpOwotICAgIH0sCi0KLSAgICBfc291 cmNlRnJhbWVTZXR1cEZpbmlzaGVkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLnNv dXJjZUZyYW1lLnNldENvbnRlbnQoInRleHQvamF2YXNjcmlwdCIsIHRoaXMuX3ByZXBlbmRXaGl0 ZXNwYWNlKHRoaXMuc2NyaXB0LnNvdXJjZSkpOwotICAgICAgICB0aGlzLl9zb3VyY2VGcmFtZVNl dHVwID0gdHJ1ZTsKKyAgICAgICAgZnVuY3Rpb24gZGlkUmVxdWVzdFNvdXJjZShzb3VyY2UpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHNvdXJjZSA9IHNvdXJjZSB8fCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIjxzb3VyY2UgaXMgbm90IGF2YWlsYWJsZT4iKTsKKyAgICAgICAgICAgIHRoaXMuc291 cmNlRnJhbWUuc2V0Q29udGVudCgidGV4dC9qYXZhc2NyaXB0IiwgdGhpcy5fcHJlcGVuZFdoaXRl c3BhY2Uoc291cmNlKSk7CisgICAgICAgICAgICB0aGlzLl9zb3VyY2VGcmFtZVNldHVwID0gdHJ1 ZTsKKyAgICAgICAgfQorICAgICAgICB0aGlzLnNjcmlwdC5yZXF1ZXN0U291cmNlKGRpZFJlcXVl c3RTb3VyY2UuYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF9wcmVwZW5kV2hpdGVzcGFjZTog ZnVuY3Rpb24oY29udGVudCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggNDJjOThmNS4uM2QxYzkyNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC00MzIs NyArNDMyLDYgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgYnJlYWtwb2ludC5hZGRFdmVudExpc3RlbmVyKCJjb25kaXRpb24tY2hhbmdlZCIsIHRoaXMu X2JyZWFrcG9pbnRDaGFuZ2VkLCB0aGlzKTsKICAgICAgICAgYnJlYWtwb2ludC5hZGRFdmVudExp c3RlbmVyKCJyZW1vdmVkIiwgdGhpcy5fYnJlYWtwb2ludFJlbW92ZWQsIHRoaXMpOwogCi0gICAg ICAgIGJyZWFrcG9pbnQuc291cmNlVGV4dCA9IHRoaXMuX3RleHRNb2RlbC5saW5lKGJyZWFrcG9p bnQubGluZSAtIDEpOwogICAgICAgICB0aGlzLl9zZXRCcmVha3BvaW50RGVjb3JhdGlvbihicmVh a3BvaW50LmxpbmUsIGJyZWFrcG9pbnQuZW5hYmxlZCwgISFicmVha3BvaW50LmNvbmRpdGlvbik7 CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC91dGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxp dGllcy5qcwppbmRleCA1MzI0N2U0Li40MzIwYmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcwpAQCAtMzg4LDYgKzM4OCwxNyBAQCBTdHJp bmcucHJvdG90eXBlLmhhc1N1YnN0cmluZyA9IGZ1bmN0aW9uKHN0cmluZywgY2FzZUluc2Vuc2l0 aXZlKQogICAgIHJldHVybiB0aGlzLm1hdGNoKG5ldyBSZWdFeHAoc3RyaW5nLmVzY2FwZUZvclJl Z0V4cCgpLCAiaSIpKTsKIH0KIAorU3RyaW5nLnByb3RvdHlwZS5maW5kQWxsID0gZnVuY3Rpb24o c3RyaW5nKQoreworICAgIHZhciBtYXRjaGVzID0gW107CisgICAgdmFyIGkgPSB0aGlzLmluZGV4 T2Yoc3RyaW5nKTsKKyAgICB3aGlsZSAoaSAhPT0gLTEpIHsKKyAgICAgICAgbWF0Y2hlcy5wdXNo KGkpOworICAgICAgICBpID0gdGhpcy5pbmRleE9mKHN0cmluZywgaSArIHN0cmluZy5sZW5ndGgp OworICAgIH0KKyAgICByZXR1cm4gbWF0Y2hlczsKK30KKwogU3RyaW5nLnByb3RvdHlwZS5hc1Bh cnNlZFVSTCA9IGZ1bmN0aW9uKCkKIHsKICAgICAvLyBSZWdFeHAgZ3JvdXBzOgo=