59077 2011-04-20 23:01:09 -0700 Web Inspector: add support for Go To Line in Resources panel. 2011-04-21 05:06:14 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 389865 0 pfeldman 2011-04-20 23:01:09 -0700 Patch to follow. 389878 1 90500 pfeldman 2011-04-20 23:46:10 -0700 Created attachment 90500 Patch 389939 2 90500 pfeldman 2011-04-21 05:06:03 -0700 Comment on attachment 90500 Patch Clearing flags on attachment: 90500 Committed r84484: <http://trac.webkit.org/changeset/84484> 389941 3 pfeldman 2011-04-21 05:06:14 -0700 All reviewed patches have been landed. Closing bug. 90500 2011-04-20 23:46:10 -0700 2011-04-21 05:06:03 -0700 Patch bug-59077-20110421104607.patch text/plain 15430 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQxNjQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4YjY1OTQ4OTRjNjIwOGM5 NGU4YTA2Y2Y3Y2UwOTM2OTM3YjU1Y2ViLi4wNDQ0ZjZlOTQ0M2UwM2FjYjkzZDVkOGQxODE4ZjUw YThjYTZhZWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDQtMjAgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHN1cHBvcnQgZm9y IEdvIFRvIExpbmUgaW4gUmVzb3VyY2VzIHBhbmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwNzcKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2Fs bFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlLnJlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0dvVG9MaW5lRGlhbG9nLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkdvVG9MaW5lRGlhbG9nLnNob3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkdvVG9M aW5lRGlhbG9nLmNyZWF0ZVNob3J0Y3V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Hb1RvTGlu ZURpYWxvZy5wcm90b3R5cGUuX29uS2V5RG93bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVs LnByb3RvdHlwZS5oYW5kbGVTaG9ydGN1dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLl9yZXN0b3JlU2Nyb2xsUG9zaXRpb25zKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuaGFuZGxlU2hvcnRjdXQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS5yZWdpc3RlclNob3J0Y3V0cyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLl9zaG93R29Ub0xpbmVEaWFsb2cpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5oYW5kbGVTaG9ydGN1dCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fcmVnaXN0ZXJTaG9ydGN1dHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5wcm90b3R5cGUuanVtcFRvUHJldmlvdXNTZWFyY2hSZXN1bHQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLl9yZWdpc3RlclNob3J0Y3V0cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRL ZXlEb3duKToKKwogMjAxMS0wNC0xNSAgU3RlcGhlbiBXaGl0ZSAgPHNlbm9yYmxhbmNvQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQ YW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3RhY2tTaWRl YmFyUGFuZS5qcwppbmRleCA4MDE4N2VhYjA5NjE5MGViMTI2ZGI0ZDZhY2M1OTBkM2U5ZTkxZTcy Li44ZDU0NTNmZTdiZjM0ZTUxYTA0MjNiNDY5YThiYjkyMGIyYTJlNTlmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJh clBhbmUuanMKQEAgLTgzLDE2ICs4Myw2IEBAIFdlYkluc3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFy UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgaGFuZGxlU2hvcnRj dXQ6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgdmFyIHNob3J0Y3V0ID0gV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21FdmVudChldmVudCk7Ci0gICAgICAg IHZhciBoYW5kbGVyID0gdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0XTsKLSAgICAgICAgaWYgKGhh bmRsZXIpIHsKLSAgICAgICAgICAgIGhhbmRsZXIoZXZlbnQpOwotICAgICAgICAgICAgZXZlbnQu aGFuZGxlZCA9IHRydWU7Ci0gICAgICAgIH0KLSAgICB9LAotCiAgICAgX3NlbGVjdE5leHRDYWxs RnJhbWVPblN0YWNrOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgaW5kZXggPSB0aGlz Ll9zZWxlY3RlZENhbGxGcmFtZUluZGV4KCk7CkBAIC0xNTIsMTcgKzE0MiwxNSBAQCBXZWJJbnNw ZWN0b3IuQ2FsbFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICBJbnNwZWN0 b3JGcm9udGVuZEhvc3QuY29weVRleHQodGV4dCk7CiAgICAgfSwKIAotICAgIHJlZ2lzdGVyU2hv cnRjdXRzOiBmdW5jdGlvbihzZWN0aW9uKQorICAgIHJlZ2lzdGVyU2hvcnRjdXRzOiBmdW5jdGlv bihzZWN0aW9uLCBzaG9ydGN1dHMpCiAgICAgewotICAgICAgICB0aGlzLl9zaG9ydGN1dHMgPSB7 fTsKLQogICAgICAgICB2YXIgbmV4dENhbGxGcmFtZSA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMu UGVyaW9kLAogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZp ZXJzLkN0cmwpOwotICAgICAgICB0aGlzLl9zaG9ydGN1dHNbbmV4dENhbGxGcmFtZS5rZXldID0g dGhpcy5fc2VsZWN0TmV4dENhbGxGcmFtZU9uU3RhY2suYmluZCh0aGlzKTsKKyAgICAgICAgc2hv cnRjdXRzW25leHRDYWxsRnJhbWUua2V5XSA9IHRoaXMuX3NlbGVjdE5leHRDYWxsRnJhbWVPblN0 YWNrLmJpbmQodGhpcyk7CiAKICAgICAgICAgdmFyIHByZXZDYWxsRnJhbWUgPSBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5LZXlzLkNvbW1hLAogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuTW9kaWZpZXJzLkN0cmwpOwotICAgICAgICB0aGlzLl9zaG9ydGN1dHNbcHJldkNhbGxG cmFtZS5rZXldID0gdGhpcy5fc2VsZWN0UHJldmlvdXNDYWxsRnJhbWVPblN0YWNrLmJpbmQodGhp cyk7CisgICAgICAgIHNob3J0Y3V0c1twcmV2Q2FsbEZyYW1lLmtleV0gPSB0aGlzLl9zZWxlY3RQ cmV2aW91c0NhbGxGcmFtZU9uU3RhY2suYmluZCh0aGlzKTsKIAogICAgICAgICBzZWN0aW9uLmFk ZFJlbGF0ZWRLZXlzKFsgbmV4dENhbGxGcmFtZS5uYW1lLCBwcmV2Q2FsbEZyYW1lLm5hbWUgXSwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOZXh0L3ByZXZpb3VzIGNhbGwgZnJhbWUiKSk7CiAgICAg fSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvR29Ub0xp bmVEaWFsb2cuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0dvVG9MaW5l RGlhbG9nLmpzCmluZGV4IGIyNDkwZTYzNDBlMjUyMjYzYTUzZWY1MWU5MjJjZWUzZmQ3ZDk2Njgu LjNiNmEzZDdjN2RlYjMwZGNlNWQ1MjczZTE4MDY0ODcyZTdjNjU0ZDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvR29Ub0xpbmVEaWFsb2cuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Hb1RvTGluZURpYWxvZy5qcwpAQCAt NzEsMTEgKzcxLDIyIEBAIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZyA9IGZ1bmN0aW9uKHZp ZXcpCiAKIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5zaG93ID0gZnVuY3Rpb24oc291cmNl VmlldykKIHsKKyAgICBpZiAoIXNvdXJjZVZpZXcgfHwgdHlwZW9mIHNvdXJjZVZpZXcuaGlnaGxp Z2h0TGluZSAhPT0gImZ1bmN0aW9uIikKKyAgICAgICAgcmV0dXJuOwogICAgIGlmICh0aGlzLl9p bnN0YW5jZSkKICAgICAgICAgcmV0dXJuOwogICAgIHRoaXMuX2luc3RhbmNlID0gbmV3IFdlYklu c3BlY3Rvci5Hb1RvTGluZURpYWxvZyhzb3VyY2VWaWV3KTsKIH0KIAorV2ViSW5zcGVjdG9yLkdv VG9MaW5lRGlhbG9nLmNyZWF0ZVNob3J0Y3V0ID0gZnVuY3Rpb24oKQoreworICAgIHZhciBpc01h YyA9IFdlYkluc3BlY3Rvci5pc01hYygpOworICAgIHZhciBzaG9ydGN1dDsKKyAgICBpZiAoaXNN YWMpCisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVz Y3JpcHRvcigibCIsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5NZXRh KTsKKyAgICByZXR1cm4gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZURlc2NyaXB0 b3IoImciLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllcnMuQ3RybCk7Cit9 CisKIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5wcm90b3R5cGUgPSB7CiAgICAgX2hpZGU6 IGZ1bmN0aW9uKCkKICAgICB7CkBAIC0xMDUsNiArMTE2LDcgQEAgV2ViSW5zcGVjdG9yLkdvVG9M aW5lRGlhbG9nLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAodGhpcy5fY2xvc2VLZXlzLmlu ZGV4T2YoZXZlbnQua2V5Q29kZSkgPj0gMCkgewogICAgICAgICAgICAgdGhpcy5faGlkZSgpOwor ICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKICAgICAgICAgICAgIGV2ZW50LnN0 b3BQcm9wYWdhdGlvbigpOwogICAgICAgICB9CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXggMzhiZTExYTVlNzQy N2U2ODgyZjdhN2EyMDM5NmY5NmE4ZDVkYzE0NC4uY2JiZTBmMGVlMGIxZmZiYzMxM2NjYTViOGYy ODQ1ZTcwMmI5YTFmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTEzMSw3ICsxMzEsMTAgQEAgV2ViSW5zcGVjdG9yLk5l dHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl92aWV3aW5nUmVzb3Vy Y2VNb2RlICYmIGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 LktleXMuRXNjLmNvZGUpIHsKICAgICAgICAgICAgIHRoaXMuX3RvZ2dsZUdyaWRNb2RlKCk7CiAg ICAgICAgICAgICBldmVudC5oYW5kbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQorCisgICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuaGFuZGxlU2hv cnRjdXQuY2FsbCh0aGlzLCBldmVudCk7CiAgICAgfSwKIAogICAgIF9jcmVhdGVUaW1lbGluZUdy aWQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVs LmpzCmluZGV4IDQ5ZDdjYzYzNWJlMjE5NTk0YTBlMzE1NGE0NTM5NDYxNmQ3ZDQ0ZTQuLmExYzNk OTViYTJlNWNlOWJhZWY2ZjUzMjVmMTUxNDg0ZGNkNGJjN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpAQCAtMzQsNiArMzQsOCBAQCBXZWJJbnNwZWN0 b3IuUGFuZWwgPSBmdW5jdGlvbihuYW1lKQogICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNz KG5hbWUpOwogICAgIHRoaXMuX3BhbmVsTmFtZSA9IG5hbWU7CiAKKyAgICB0aGlzLl9zaG9ydGN1 dHMgPSB7fTsKKwogICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5pbnN0YWxsQXBwbGljYXRpb25T ZXR0aW5nKHRoaXMuX3NpZGViYXJXaWR0aFNldHRpbmdOYW1lKCksIHVuZGVmaW5lZCk7CiB9CiAK QEAgLTQxOCw2ICs0MjAsMzEgQEAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIGlmIChjb250YWluZXIuX3Njcm9sbFRvcCkKICAgICAgICAgICAgICAgICBjb250 YWluZXIuc2Nyb2xsVG9wID0gY29udGFpbmVyLl9zY3JvbGxUb3A7CiAgICAgICAgIH0KKyAgICB9 LAorCisgICAgaGFuZGxlU2hvcnRjdXQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAg dmFyIHNob3J0Y3V0S2V5ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZy b21FdmVudChldmVudCk7CisgICAgICAgIHZhciBoYW5kbGVyID0gdGhpcy5fc2hvcnRjdXRzW3No b3J0Y3V0S2V5XTsKKyAgICAgICAgaWYgKGhhbmRsZXIpIHsKKyAgICAgICAgICAgIGhhbmRsZXIo ZXZlbnQpOworICAgICAgICAgICAgZXZlbnQuaGFuZGxlZCA9IHRydWU7CisgICAgICAgIH0KKyAg ICB9LAorCisgICAgcmVnaXN0ZXJTaG9ydGN1dHM6IGZ1bmN0aW9uKHNob3J0Y3V0cykKKyAgICB7 CisgICAgICAgIHRoaXMuX3Nob3J0Y3V0cyA9IHNob3J0Y3V0cyB8fCB7fTsKKyAgICAgICAgdmFy IGdvVG9MaW5lU2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuR29Ub0xpbmVEaWFsb2cuY3JlYXRlU2hv cnRjdXQoKTsKKyAgICAgICAgdGhpcy5fc2hvcnRjdXRzW2dvVG9MaW5lU2hvcnRjdXQua2V5XSA9 IHRoaXMuX3Nob3dHb1RvTGluZURpYWxvZy5iaW5kKHRoaXMpOworICAgIH0sCisKKyAgICBfc2hv d0dvVG9MaW5lRGlhbG9nOiBmdW5jdGlvbihlKQorICAgIHsKKyAgICAgICAgIHZhciB2aWV3ID0g dGhpcy52aXNpYmxlVmlldzsKKyAgICAgICAgIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5z aG93KHZpZXcpOworICAgICAgICAgaWYgKHZpZXcpCisgICAgICAgICAgICAgV2ViSW5zcGVjdG9y LkdvVG9MaW5lRGlhbG9nLnNob3codmlldyk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKaW5kZXggZDlhMTE3 ODZlMjFjNTQwZmUyZWFkZjJkYTBiODc2ZTE4YjA5YjZkZi4uOTI3NWJiMTQyZGNiM2YwNWMyYTU0 MmI5MjMwNWJkNDljMmM4ZTUwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwpAQCAtNzM2LDEzICs3MzYsMTQgQEAgV2ViSW5z cGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgaGFuZGxlU2hvcnRjdXQ6 IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCFQcmVmZXJlbmNlcy5oZWFwUHJv ZmlsZXJQcmVzZW50IHx8IFByZWZlcmVuY2VzLmRldGFpbGVkSGVhcFByb2ZpbGVzKQotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICB2YXIgY29tYm8gPSBbIlUrMDA0QyIsICJVKzAwNDUiLCAi VSswMDQxIiwgIlUrMDA0QiIsICJVKzAwNUEiXTsgIC8vICJMRUFLWiIKLSAgICAgICAgaWYgKHRo aXMuX3JlY29nbml6ZUtleWJvYXJkQ29tYm8oY29tYm8sIGV2ZW50KSkgewotICAgICAgICAgICAg dGhpcy5fZGlzcGxheURldGFpbGVkSGVhcFByb2ZpbGVzRW5hYmxlZEhpbnQoKTsgICAgICAgICAg Ci0gICAgICAgICAgICB0aGlzLl9lbmFibGVEZXRhaWxlZEhlYXBQcm9maWxlcyh0cnVlKTsKKyAg ICAgICAgaWYgKFByZWZlcmVuY2VzLmhlYXBQcm9maWxlclByZXNlbnQgJiYgUHJlZmVyZW5jZXMu ZGV0YWlsZWRIZWFwUHJvZmlsZXMpIHsKKyAgICAgICAgICAgIHZhciBjb21ibyA9IFsiVSswMDRD IiwgIlUrMDA0NSIsICJVKzAwNDEiLCAiVSswMDRCIiwgIlUrMDA1QSJdOyAgLy8gIkxFQUtaIgor ICAgICAgICAgICAgaWYgKHRoaXMuX3JlY29nbml6ZUtleWJvYXJkQ29tYm8oY29tYm8sIGV2ZW50 KSkgeworICAgICAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlEZXRhaWxlZEhlYXBQcm9maWxlc0Vu YWJsZWRIaW50KCk7ICAgICAgICAgIAorICAgICAgICAgICAgICAgIHRoaXMuX2VuYWJsZURldGFp bGVkSGVhcFByb2ZpbGVzKHRydWUpOworICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAg IFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuaGFuZGxlU2hvcnRjdXQuY2FsbCh0aGlzLCBl dmVudCk7CiAgICAgfSwKIAogICAgIF9yZWNvZ25pemVLZXlib2FyZENvbWJvOiBmdW5jdGlvbihj b21ibywgZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCBlMmIzNTQyZjRmNWI1ZGJlNDI3ZDZlN2RkZTE2NmZi YTY5NzAxYTA3Li43ZTdmYzRiNDczYTlhMmIyMDhmYTBkZTNkMzg4MTAxYzkxZTE5MWQ1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVs LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFu ZWwuanMKQEAgLTc1LDYgKzc1LDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0gZnVu Y3Rpb24oZGF0YWJhc2UpCiAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJtb3VzZW1vdmUiLCB0aGlzLl9vbm1vdXNlbW92ZS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAg dGhpcy5zaWRlYmFyRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW91dCIsIHRoaXMuX29u bW91c2VvdXQuYmluZCh0aGlzKSwgZmFsc2UpOwogCisgICAgdGhpcy5yZWdpc3RlclNob3J0Y3V0 cygpOworCiAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VVcGRhdGVkLCB0 aGlzLl9yZWZyZXNoUmVzb3VyY2UsIHRoaXMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDhhNmM1OGViYmU1MjBm MWM1Zjc1MGY0MWFlMjY2ZTQzNmM4YTA2YjEuLmM4MWJiYTk2OGYyNjBiNjQ3YTA1NTMzNjM1YzVj OGM2MmQyNzQ1NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCkBAIC01MDMsMTcgKzUwMyw2IEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBzb3VyY2VGcmFtZS5oaWdobGlnaHRMaW5l KGxpbmVOdW1iZXIpOwogICAgIH0sCiAKLSAgICBoYW5kbGVTaG9ydGN1dDogZnVuY3Rpb24oZXZl bnQpCi0gICAgewotICAgICAgICB2YXIgc2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5tYWtlS2V5RnJvbUV2ZW50KGV2ZW50KTsKLSAgICAgICAgdmFyIGhhbmRsZXIgPSB0 aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXRdOwotICAgICAgICBpZiAoaGFuZGxlcikgewotICAgICAg ICAgICAgaGFuZGxlcihldmVudCk7Ci0gICAgICAgICAgICBldmVudC5oYW5kbGVkID0gdHJ1ZTsK LSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2su aGFuZGxlU2hvcnRjdXQoZXZlbnQpOwotICAgIH0sCi0KICAgICBfc2hvd1NvdXJjZUZyYW1lQW5k QWRkVG9IaXN0b3J5OiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAgICAgewogICAgICAgICB2YXIg c291cmNlRnJhbWUgPSB0aGlzLl9zaG93U291cmNlRnJhbWUoc291cmNlRmlsZUlkKTsKQEAgLTg4 Nyw0OCArODc2LDQyIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICB2YXIgaGFuZGxlciwgc2hvcnRjdXQxLCBzaG9ydGN1dDI7CiAgICAgICAgIHZhciBw bGF0Zm9ybVNwZWNpZmljTW9kaWZpZXIgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllcnMuQ3RybE9yTWV0YTsKIAotICAgICAgICB0aGlzLl9zaG9ydGN1dHMgPSB7fTsKKyAg ICAgICAgdmFyIHNob3J0Y3V0cyA9IHt9OwogCiAgICAgICAgIC8vIENvbnRpbnVlLgogICAgICAg ICBoYW5kbGVyID0gdGhpcy5wYXVzZUJ1dHRvbi5jbGljay5iaW5kKHRoaXMucGF1c2VCdXR0b24p OwogICAgICAgICBzaG9ydGN1dDEgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtl RGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkY4KTsKLSAgICAg ICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0MS5rZXldID0gaGFuZGxlcjsKKyAgICAgICAgc2hv cnRjdXRzW3Nob3J0Y3V0MS5rZXldID0gaGFuZGxlcjsKICAgICAgICAgc2hvcnRjdXQyID0gV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuS2V5cy5TbGFzaCwgcGxhdGZvcm1TcGVjaWZpY01vZGlmaWVyKTsKLSAg ICAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0Mi5rZXldID0gaGFuZGxlcjsKKyAgICAgICAg c2hvcnRjdXRzW3Nob3J0Y3V0Mi5rZXldID0gaGFuZGxlcjsKICAgICAgICAgc2VjdGlvbi5hZGRB bHRlcm5hdGVLZXlzKFsgc2hvcnRjdXQxLm5hbWUsIHNob3J0Y3V0Mi5uYW1lIF0sIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiQ29udGludWUiKSk7CiAKICAgICAgICAgLy8gU3RlcCBvdmVyLgogICAg ICAgICBoYW5kbGVyID0gdGhpcy5zdGVwT3ZlckJ1dHRvbi5jbGljay5iaW5kKHRoaXMuc3RlcE92 ZXJCdXR0b24pOwogICAgICAgICBzaG9ydGN1dDEgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkYx MCk7Ci0gICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tzaG9ydGN1dDEua2V5XSA9IGhhbmRsZXI7Cisg ICAgICAgIHNob3J0Y3V0c1tzaG9ydGN1dDEua2V5XSA9IGhhbmRsZXI7CiAgICAgICAgIHNob3J0 Y3V0MiA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuU2luZ2xlUXVvdGUsIHBsYXRmb3JtU3BlY2lm aWNNb2RpZmllcik7Ci0gICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tzaG9ydGN1dDIua2V5XSA9IGhh bmRsZXI7CisgICAgICAgIHNob3J0Y3V0c1tzaG9ydGN1dDIua2V5XSA9IGhhbmRsZXI7CiAgICAg ICAgIHNlY3Rpb24uYWRkQWx0ZXJuYXRlS2V5cyhbIHNob3J0Y3V0MS5uYW1lLCBzaG9ydGN1dDIu bmFtZSBdLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3ZlciIpKTsKIAogICAgICAgICAv LyBTdGVwIGludG8uCiAgICAgICAgIGhhbmRsZXIgPSB0aGlzLnN0ZXBJbnRvQnV0dG9uLmNsaWNr LmJpbmQodGhpcy5zdGVwSW50b0J1dHRvbik7CiAgICAgICAgIHNob3J0Y3V0MSA9IFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0LktleXMuRjExKTsKLSAgICAgICAgdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0MS5r ZXldID0gaGFuZGxlcjsKKyAgICAgICAgc2hvcnRjdXRzW3Nob3J0Y3V0MS5rZXldID0gaGFuZGxl cjsKICAgICAgICAgc2hvcnRjdXQyID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFr ZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5TZW1pY29sb24s IHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllcik7Ci0gICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tzaG9y dGN1dDIua2V5XSA9IGhhbmRsZXI7CisgICAgICAgIHNob3J0Y3V0c1tzaG9ydGN1dDIua2V5XSA9 IGhhbmRsZXI7CiAgICAgICAgIHNlY3Rpb24uYWRkQWx0ZXJuYXRlS2V5cyhbIHNob3J0Y3V0MS5u YW1lLCBzaG9ydGN1dDIubmFtZSBdLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgaW50byIp KTsKIAogICAgICAgICAvLyBTdGVwIG91dC4KICAgICAgICAgaGFuZGxlciA9IHRoaXMuc3RlcE91 dEJ1dHRvbi5jbGljay5iaW5kKHRoaXMuc3RlcE91dEJ1dHRvbik7CiAgICAgICAgIHNob3J0Y3V0 MSA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRjExLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5Nb2RpZmllcnMuU2hpZnQpOwotICAgICAgICB0aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXQx LmtleV0gPSBoYW5kbGVyOworICAgICAgICBzaG9ydGN1dHNbc2hvcnRjdXQxLmtleV0gPSBoYW5k bGVyOwogICAgICAgICBzaG9ydGN1dDIgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5t YWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlNlbWljb2xv biwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLlNoaWZ0LCBwbGF0Zm9y bVNwZWNpZmljTW9kaWZpZXIpOwotICAgICAgICB0aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXQyLmtl eV0gPSBoYW5kbGVyOworICAgICAgICBzaG9ydGN1dHNbc2hvcnRjdXQyLmtleV0gPSBoYW5kbGVy OwogICAgICAgICBzZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoWyBzaG9ydGN1dDEubmFtZSwgc2hv cnRjdXQyLm5hbWUgXSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIG91dCIpKTsKIAotICAg ICAgICB2YXIgaXNNYWMgPSBXZWJJbnNwZWN0b3IuaXNNYWMoKTsKLSAgICAgICAgaWYgKGlzTWFj KQotICAgICAgICAgICAgc2hvcnRjdXQxID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu bWFrZURlc2NyaXB0b3IoImwiLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmll cnMuTWV0YSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNob3J0Y3V0MSA9IFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKCJnIiwgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLkN0cmwpOwotICAgICAgICB0aGlzLl9zaG9ydGN1dHNb c2hvcnRjdXQxLmtleV0gPSB0aGlzLnNob3dHb1RvTGluZURpYWxvZy5iaW5kKHRoaXMpOwotICAg ICAgICBzZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoWyBzaG9ydGN1dDEubmFtZSBdLCBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkdvIHRvIExpbmUiKSk7Ci0gICAgICAgIHRoaXMuc2lkZWJhclBhbmVz LmNhbGxzdGFjay5yZWdpc3RlclNob3J0Y3V0cyhzZWN0aW9uKTsKKyAgICAgICAgdGhpcy5zaWRl YmFyUGFuZXMuY2FsbHN0YWNrLnJlZ2lzdGVyU2hvcnRjdXRzKHNlY3Rpb24sIHNob3J0Y3V0cyk7 CisgICAgICAgIHRoaXMucmVnaXN0ZXJTaG9ydGN1dHMoc2hvcnRjdXRzKTsKICAgICB9LAogCiAg ICAgc2VhcmNoQ2FuY2VsZWQ6IGZ1bmN0aW9uKCkKQEAgLTk5OCwxMyArOTgxLDYgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGVsc2UKICAgICAgICAg ICAgIHRoaXMuX3NlYXJjaFZpZXcuanVtcFRvUHJldmlvdXNTZWFyY2hSZXN1bHQoKTsKICAgICB9 LAotCi0gICAgc2hvd0dvVG9MaW5lRGlhbG9nOiBmdW5jdGlvbihlKQotICAgIHsKLSAgICAgICAg IHZhciB2aWV3ID0gdGhpcy52aXNpYmxlVmlldzsKLSAgICAgICAgIGlmICh2aWV3KQotICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5zaG93KHZpZXcpOwotICAgIH0KIH0K IAogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggYzAyZTgxOTY4Y2NhY2IyMWUzODA3YmFhOTBlMjdj OTQzNGQyYzYyYi4uOTBkOTk4OGI0ZGQ5ZWM3NDljMTQ2MjA3YjdhMDhhZDRlNTM2NTBhZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAg LTY4MSw2ICs2ODEsOSBAQCBXZWJJbnNwZWN0b3IuX3JlZ2lzdGVyU2hvcnRjdXRzID0gZnVuY3Rp b24oKQogICAgICAgICBdOwogICAgICAgICBzZWN0aW9uLmFkZFJlbGF0ZWRLZXlzKGtleXMsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRmluZCBuZXh0L3ByZXZpb3VzIikpOwogICAgIH0KKworICAg IHZhciBnb1RvU2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuR29Ub0xpbmVEaWFsb2cuY3JlYXRlU2hv cnRjdXQoKTsKKyAgICBzZWN0aW9uLmFkZEtleShnb1RvU2hvcnRjdXQubmFtZSwgV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJHbyB0byBMaW5lIikpOwogfQogCiBXZWJJbnNwZWN0b3IuZG9jdW1lbnRL ZXlEb3duID0gZnVuY3Rpb24oZXZlbnQpCkBAIC03MDgsNyArNzExLDcgQEAgV2ViSW5zcGVjdG9y LmRvY3VtZW50S2V5RG93biA9IGZ1bmN0aW9uKGV2ZW50KQogICAgICAgICB9CiAgICAgfQogCi0g ICAgaWYgKHRoaXMuY3VycmVudFBhbmVsICYmIHRoaXMuY3VycmVudFBhbmVsLmhhbmRsZVNob3J0 Y3V0KSB7CisgICAgaWYgKHRoaXMuY3VycmVudFBhbmVsKSB7CiAgICAgICAgIHRoaXMuY3VycmVu dFBhbmVsLmhhbmRsZVNob3J0Y3V0KGV2ZW50KTsKICAgICAgICAgaWYgKGV2ZW50LmhhbmRsZWQp IHsKICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Cg==