48830 2010-11-02 06:10:14 -0700 Web Inspector: xhr breakpoints should be editable 2010-11-02 07:33:16 -0700 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 303328 0 podivilov 2010-11-02 06:10:14 -0700 Web Inspector: xhr breakpoints should be editable 303330 1 72655 podivilov 2010-11-02 06:11:59 -0700 Created attachment 72655 Patch. 303352 2 podivilov 2010-11-02 07:33:16 -0700 Committed r71113: <http://trac.webkit.org/changeset/71113> 72655 2010-11-02 06:11:59 -0700 2010-11-02 07:26:33 -0700 Patch. patch text/plain 14976 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWZhMzcyZC4uZmIyYmIzZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxMC0xMS0wMiAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiB4aHIgYnJlYWtwb2ludHMgc2hv dWxkIGJlIGVkaXRhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00ODgzMAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50 TWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZS5z ZXQgc291cmNlVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5wcm90b3R5 cGUuY2xpY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBlLnBv cHVsYXRlTGFiZWxFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50 LnByb3RvdHlwZS5wb3B1bGF0ZUVkaXRFbGVtZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu QnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5cGUuYWRkQnJlYWtwb2ludEl0ZW0pOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlLl9icmVh a3BvaW50SXRlbUNsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRzU2lk ZWJhclBhbmUucHJvdG90eXBlLl9jb250ZXh0TWVudUV2ZW50RmlyZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlLl9icmVha3BvaW50SXRl bVJlbW92ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBh bmUuYWRkQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2lu dHNTaWRlYmFyUGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludHNTaWRl YmFyUGFuZS5wcm90b3R5cGUuX3N0YXJ0RWRpdGluZ0JyZWFrcG9pbnQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlLl9oaWRlRWRpdEJy ZWFrcG9pbnREaWFsb2cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lk ZWJhclBhbmUucHJvdG90eXBlLl9icmVha3BvaW50SXRlbUNsaWNrZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnRJdGVtKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3Bv aW50SXRlbS5wcm90b3R5cGUuY2xpY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRJdGVtLnByb3RvdHlwZS5wb3B1bGF0ZUVkaXRFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5CcmVha3BvaW50SXRlbS5wcm90b3R5cGUucmVtb3ZlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5CcmVha3BvaW50SXRlbS5wcm90b3R5cGUuX2hpdFN0YXRlQ2hhbmdlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludEl0ZW0ucHJvdG90eXBlLl9sYWJlbENoYW5nZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRJdGVtLnByb3RvdHlwZS5fY3JlYXRlTGFi ZWxFbGVtZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5jcmVhdGVKU0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuYnJl YWtwb2ludEFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5jcmVhdGVKU0JyZWFrcG9pbnRz U2lkZWJhclBhbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNyZWF0ZURPTUJyZWFrcG9pbnRz U2lkZWJhclBhbmUuYnJlYWtwb2ludEFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5jcmVh dGVET01CcmVha3BvaW50c1NpZGViYXJQYW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5jcmVh dGVYSFJCcmVha3BvaW50c1NpZGViYXJQYW5lLmJyZWFrcG9pbnRBZGRlZCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuY3JlYXRlWEhSQnJlYWtwb2ludHNTaWRlYmFyUGFuZSk6CisKIDIwMTAtMTEt MDIgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKaW5kZXggZDRkZjY1Mi4uNGJlNTZhMSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpz CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcwpA QCAtMzQ3LDcgKzM0Nyw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50LnByb3RvdHlwZSA9IHsK ICAgICBzZXQgc291cmNlVGV4dCh0ZXh0KQogICAgIHsKICAgICAgICAgdGhpcy5fc291cmNlVGV4 dCA9IHRleHQ7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJ0ZXh0LWNo YW5nZWQiKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoImxhYmVsLWNo YW5nZWQiKTsKICAgICB9LAogCiAgICAgZ2V0IGlkKCkKQEAgLTM3Miw2ICszNzIsMTEgQEAgV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycygiY29uZGl0aW9uLWNoYW5nZWQiKTsKICAgICB9LAogCisgICAgY2xp Y2s6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5z Y3JpcHRzLnNob3dTb3VyY2VMaW5lKHRoaXMudXJsLCB0aGlzLmxpbmUpOworICAgIH0sCisKICAg ICBjb21wYXJlVG86IGZ1bmN0aW9uKG90aGVyKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMudXJs ICE9IG90aGVyLnVybCkKQEAgLTM4MSw2ICszODYsMTggQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gMDsKICAgICB9LAogCisgICAgcG9wdWxh dGVMYWJlbEVsZW1lbnQ6IGZ1bmN0aW9uKGVsZW1lbnQpCisgICAgeworICAgICAgICB2YXIgZGlz cGxheU5hbWUgPSB0aGlzLnVybCA/IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCh0aGlz LnVybCkgOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihwcm9ncmFtKSIpOworICAgICAgICB2YXIg bGFiZWxFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoZGlzcGxheU5hbWUgKyAiOiIg KyB0aGlzLmxpbmUpOworICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxkKGxhYmVsRWxlbWVudCk7 CisKKyAgICAgICAgdmFyIHNvdXJjZVRleHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CisgICAgICAgIHNvdXJjZVRleHRFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5z b3VyY2VUZXh0OworICAgICAgICBzb3VyY2VUZXh0RWxlbWVudC5jbGFzc05hbWUgPSAic291cmNl LXRleHQgbW9ub3NwYWNlIjsKKyAgICAgICAgZWxlbWVudC5hcHBlbmRDaGlsZChzb3VyY2VUZXh0 RWxlbWVudCk7CisgICAgfSwKKwogICAgIHJlbW92ZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAg ICAgSW5zcGVjdG9yQmFja2VuZC5yZW1vdmVCcmVha3BvaW50KHRoaXMuc291cmNlSUQsIHRoaXMu bGluZSk7CkBAIC01NjksNiArNTg2LDExIEBAIFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50LnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2NvbXBhcmUodGhpcy5fdXJsLCBvdGhl ci5fdXJsKTsKICAgICB9LAogCisgICAgcG9wdWxhdGVFZGl0RWxlbWVudDogZnVuY3Rpb24oZWxl bWVudCkKKyAgICB7CisgICAgICAgIGVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlzLl91cmw7Cisg ICAgfSwKKwogICAgIHBvcHVsYXRlTGFiZWxFbGVtZW50OiBmdW5jdGlvbihlbGVtZW50KQogICAg IHsKICAgICAgICAgdmFyIGxhYmVsOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwppbmRleCA3MjU0MmVhLi4xZWYyZjk4IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFy UGFuZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRl YmFyUGFuZS5qcwpAQCAtNDcsMTAgKzQ3LDEwIEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50c1Np ZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBhZGRCcmVh a3BvaW50OiBmdW5jdGlvbihicmVha3BvaW50SXRlbSkKKyAgICBhZGRCcmVha3BvaW50SXRlbTog ZnVuY3Rpb24oYnJlYWtwb2ludEl0ZW0pCiAgICAgewotICAgICAgICBicmVha3BvaW50SXRlbS5h ZGRFdmVudExpc3RlbmVyKCJicmVha3BvaW50LWhpdCIsIHRoaXMuX2JyZWFrcG9pbnRIaXQsIHRo aXMpOwotICAgICAgICBicmVha3BvaW50SXRlbS5hZGRFdmVudExpc3RlbmVyKCJyZW1vdmVkIiwg dGhpcy5fYnJlYWtwb2ludFJlbW92ZWQsIHRoaXMpOworICAgICAgICBicmVha3BvaW50SXRlbS5h ZGRFdmVudExpc3RlbmVyKCJicmVha3BvaW50LWhpdCIsIHRoaXMuZXhwYW5kLCB0aGlzKTsKKyAg ICAgICAgYnJlYWtwb2ludEl0ZW0uYWRkRXZlbnRMaXN0ZW5lcigicmVtb3ZlZCIsIHRoaXMuX2Jy ZWFrcG9pbnRJdGVtUmVtb3ZlZCwgdGhpcyk7CiAKICAgICAgICAgdmFyIGVsZW1lbnQgPSBicmVh a3BvaW50SXRlbS5lbGVtZW50KCk7CiAgICAgICAgIGVsZW1lbnQuX2JyZWFrcG9pbnRJdGVtID0g YnJlYWtwb2ludEl0ZW07CkBAIC02Niw2ICs2Niw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50 c1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFjdXJyZW50RWxlbWVudCkK ICAgICAgICAgICAgIHRoaXMubGlzdEVsZW1lbnQuYXBwZW5kQ2hpbGQoZWxlbWVudCk7CiAKKyAg ICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2JyZWFrcG9pbnRJ dGVtQ2xpY2tlZC5iaW5kKHRoaXMsIGJyZWFrcG9pbnRJdGVtKSwgZmFsc2UpOwogICAgICAgICBl bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5fY29udGV4dE1lbnVF dmVudEZpcmVkLmJpbmQodGhpcywgYnJlYWtwb2ludEl0ZW0pLCB0cnVlKTsKIAogICAgICAgICBp ZiAodGhpcy5lbXB0eUVsZW1lbnQucGFyZW50RWxlbWVudCkgewpAQCAtNzQsMjUgKzc1LDI1IEBA IFdlYkluc3BlY3Rvci5CcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgfQogICAgIH0sCiAKLSAgICBfYnJlYWtwb2ludEhpdDogZnVuY3Rpb24oZXZlbnQpCisgICAg X2JyZWFrcG9pbnRJdGVtQ2xpY2tlZDogZnVuY3Rpb24oYnJlYWtwb2ludEl0ZW0sIGV2ZW50KQog ICAgIHsKLSAgICAgICAgdGhpcy5leHBhbmRlZCA9IHRydWU7CisgICAgICAgIGJyZWFrcG9pbnRJ dGVtLmNsaWNrKGV2ZW50KTsKICAgICB9LAogCi0gICAgX2JyZWFrcG9pbnRSZW1vdmVkOiBmdW5j dGlvbihldmVudCkKKyAgICBfY29udGV4dE1lbnVFdmVudEZpcmVkOiBmdW5jdGlvbihicmVha3Bv aW50SXRlbSwgZXZlbnQpCisgICAgeworICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2Vi SW5zcGVjdG9yLkNvbnRleHRNZW51KCk7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW1vdmUgQnJlYWtwb2ludCIpLCBicmVha3BvaW50SXRl bS5yZW1vdmUuYmluZChicmVha3BvaW50SXRlbSkpOworICAgICAgICBjb250ZXh0TWVudS5zaG93 KGV2ZW50KTsKKyAgICB9LAorCisgICAgX2JyZWFrcG9pbnRJdGVtUmVtb3ZlZDogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLmxpc3RFbGVtZW50LnJlbW92ZUNoaWxkKGV2ZW50 LnRhcmdldC5lbGVtZW50KCkpOwogICAgICAgICBpZiAoIXRoaXMubGlzdEVsZW1lbnQuZmlyc3RD aGlsZCkgewogICAgICAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5yZW1vdmVDaGlsZCh0aGlzLmxp c3RFbGVtZW50KTsKICAgICAgICAgICAgIHRoaXMuYm9keUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhp cy5lbXB0eUVsZW1lbnQpOwogICAgICAgICB9Ci0gICAgfSwKLQotICAgIF9jb250ZXh0TWVudUV2 ZW50RmlyZWQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnRJdGVtLCBldmVudCkKLSAgICB7Ci0gICAgICAg IHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKLSAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlbW92ZSBC cmVha3BvaW50IiksIGJyZWFrcG9pbnRJdGVtLnJlbW92ZS5iaW5kKGJyZWFrcG9pbnRJdGVtKSk7 Ci0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOwogICAgIH0KIH0KIApAQCAtMTAyLDM2 ICsxMDMsNTIgQEAgV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUgPSBmdW5j dGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRzU2lkZWJhclBhbmUuY2FsbCh0 aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlhIUiBCcmVha3BvaW50cyIpKTsKIAorICAgIGZ1 bmN0aW9uIGFkZEJ1dHRvbkNsaWNrZWQoZXZlbnQpCisgICAgeworICAgICAgICBldmVudC5zdG9w UHJvcGFnYXRpb24oKTsKKyAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nQnJlYWtwb2ludChudWxs KTsKKyAgICB9CisKICAgICB2YXIgYWRkQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi YnV0dG9uIik7CiAgICAgYWRkQnV0dG9uLmNsYXNzTmFtZSA9ICJhZGQiOwotICAgIGFkZEJ1dHRv bi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3Nob3dFZGl0QnJlYWtwb2ludERpYWxv Zy5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgYWRkQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgYWRkQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy50aXRs ZUVsZW1lbnQuYXBwZW5kQ2hpbGQoYWRkQnV0dG9uKTsKLQotICAgIHRoaXMudXJsSW5wdXRFbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgIHRoaXMudXJsSW5wdXRF bGVtZW50LmNsYXNzTmFtZSA9ICJicmVha3BvaW50LWNvbmRpdGlvbiBlZGl0aW5nIjsKIH0KIAog V2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewotICAg IF9zaG93RWRpdEJyZWFrcG9pbnREaWFsb2c6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9zdGFydEVk aXRpbmdCcmVha3BvaW50OiBmdW5jdGlvbihicmVha3BvaW50SXRlbSkKICAgICB7Ci0gICAgICAg IGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwotCi0gICAgICAgIGlmICh0aGlzLnVybElucHV0RWxl bWVudC5wYXJlbnRFbGVtZW50KQorICAgICAgICBpZiAodGhpcy5fZWRpdGluZ0JyZWFrcG9pbnQp CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2VkaXRpbmdCcmVha3BvaW50ID0g dHJ1ZTsKIAogICAgICAgICBpZiAoIXRoaXMuZXhwYW5kZWQpCiAgICAgICAgICAgICB0aGlzLmV4 cGFuZGVkID0gdHJ1ZTsKIAotICAgICAgICB0aGlzLnVybElucHV0RWxlbWVudC50ZXh0Q29udGVu dCA9ICIiOwotICAgICAgICB0aGlzLmJvZHlFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLnVybElu cHV0RWxlbWVudCwgdGhpcy5ib2R5RWxlbWVudC5maXJzdENoaWxkKTsKLSAgICAgICAgV2ViSW5z cGVjdG9yLnN0YXJ0RWRpdGluZyh0aGlzLnVybElucHV0RWxlbWVudCwgdGhpcy5faGlkZUVkaXRC cmVha3BvaW50RGlhbG9nLmJpbmQodGhpcywgZmFsc2UpLCB0aGlzLl9oaWRlRWRpdEJyZWFrcG9p bnREaWFsb2cuYmluZCh0aGlzLCB0cnVlKSk7CisgICAgICAgIHZhciBpbnB1dEVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgIGlucHV0RWxlbWVudC5jbGFz c05hbWUgPSAiYnJlYWtwb2ludC1jb25kaXRpb24gZWRpdGluZyI7CisgICAgICAgIGlmIChicmVh a3BvaW50SXRlbSkgeworICAgICAgICAgICAgYnJlYWtwb2ludEl0ZW0ucG9wdWxhdGVFZGl0RWxl bWVudChpbnB1dEVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5pbnNlcnRC ZWZvcmUoaW5wdXRFbGVtZW50LCBicmVha3BvaW50SXRlbS5lbGVtZW50KTsKKyAgICAgICAgICAg IGJyZWFrcG9pbnRJdGVtLnJlbW92ZSgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg aW5wdXRFbGVtZW50LnRleHRDb250ZW50ID0gIiI7CisgICAgICAgICAgICB0aGlzLmJvZHlFbGVt ZW50Lmluc2VydEJlZm9yZShpbnB1dEVsZW1lbnQsIHRoaXMuYm9keUVsZW1lbnQuZmlyc3RDaGls ZCk7CisgICAgICAgIH0KKyAgICAgICAgV2ViSW5zcGVjdG9yLnN0YXJ0RWRpdGluZyhpbnB1dEVs ZW1lbnQsIHRoaXMuX2hpZGVFZGl0QnJlYWtwb2ludERpYWxvZy5iaW5kKHRoaXMsIGlucHV0RWxl bWVudCwgZmFsc2UpLCB0aGlzLl9oaWRlRWRpdEJyZWFrcG9pbnREaWFsb2cuYmluZCh0aGlzLCBp bnB1dEVsZW1lbnQsIHRydWUpKTsKICAgICB9LAogCi0gICAgX2hpZGVFZGl0QnJlYWtwb2ludERp YWxvZzogZnVuY3Rpb24oZGlzY2FyZCkKKyAgICBfaGlkZUVkaXRCcmVha3BvaW50RGlhbG9nOiBm dW5jdGlvbihpbnB1dEVsZW1lbnQsIGRpc2NhcmQpCiAgICAgewogICAgICAgICBpZiAoIWRpc2Nh cmQpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuYnJlYWtwb2ludE1hbmFnZXIuY3JlYXRlWEhS QnJlYWtwb2ludCh0aGlzLnVybElucHV0RWxlbWVudC50ZXh0Q29udGVudC50b0xvd2VyQ2FzZSgp KTsKLSAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5yZW1vdmVDaGlsZCh0aGlzLnVybElucHV0RWxl bWVudCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuYnJlYWtwb2ludE1hbmFnZXIuY3JlYXRl WEhSQnJlYWtwb2ludChpbnB1dEVsZW1lbnQudGV4dENvbnRlbnQudG9Mb3dlckNhc2UoKSk7Cisg ICAgICAgIHRoaXMuYm9keUVsZW1lbnQucmVtb3ZlQ2hpbGQoaW5wdXRFbGVtZW50KTsKKyAgICAg ICAgdGhpcy5fZWRpdGluZ0JyZWFrcG9pbnQgPSBmYWxzZTsKKyAgICB9LAorCisgICAgX2JyZWFr cG9pbnRJdGVtQ2xpY2tlZDogZnVuY3Rpb24oYnJlYWtwb2ludEl0ZW0sIGV2ZW50KQorICAgIHsK KyAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nQnJlYWtwb2ludChicmVha3BvaW50SXRlbSk7CiAg ICAgfQogfQogCkBAIC0xNDIsNyArMTU5LDYgQEAgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRJdGVt ID0gZnVuY3Rpb24oYnJlYWtwb2ludCkKICAgICB0aGlzLl9icmVha3BvaW50ID0gYnJlYWtwb2lu dDsKIAogICAgIHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJsaSIpOwot ICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9icmVha3Bv aW50Q2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICB2YXIgY2hlY2tib3hFbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW5wdXQiKTsKICAgICBjaGVja2JveEVsZW1lbnQu Y2xhc3NOYW1lID0gImNoZWNrYm94LWVsZW0iOwpAQCAtMTUxLDExICsxNjcsMTEgQEAgV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnRJdGVtID0gZnVuY3Rpb24oYnJlYWtwb2ludCkKICAgICBjaGVja2Jv eEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9jaGVja2JveENsaWNrZWQu YmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQoY2hlY2ti b3hFbGVtZW50KTsKIAotICAgIGlmICgicG9wdWxhdGVMYWJlbEVsZW1lbnQiIGluIHRoaXMuX2Jy ZWFrcG9pbnQpCi0gICAgICAgIHRoaXMuX2JyZWFrcG9pbnQucG9wdWxhdGVMYWJlbEVsZW1lbnQo dGhpcy5fZWxlbWVudCk7CisgICAgdGhpcy5fY3JlYXRlTGFiZWxFbGVtZW50KCk7CiAKICAgICB0 aGlzLl9icmVha3BvaW50LmFkZEV2ZW50TGlzdGVuZXIoImVuYWJsZS1jaGFuZ2VkIiwgdGhpcy5f ZW5hYmxlQ2hhbmdlZCwgdGhpcyk7CiAgICAgdGhpcy5fYnJlYWtwb2ludC5hZGRFdmVudExpc3Rl bmVyKCJoaXQtc3RhdGUtY2hhbmdlZCIsIHRoaXMuX2hpdFN0YXRlQ2hhbmdlZCwgdGhpcyk7Cisg ICAgdGhpcy5fYnJlYWtwb2ludC5hZGRFdmVudExpc3RlbmVyKCJsYWJlbC1jaGFuZ2VkIiwgdGhp cy5fbGFiZWxDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlzLl9icmVha3BvaW50LmFkZEV2ZW50TGlz dGVuZXIoInJlbW92ZWQiLCB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycy5iaW5kKHRoaXMs ICJyZW1vdmVkIikpOwogfQogCkBAIC0xNzAsMTUgKzE4NiwxOSBAQCBXZWJJbnNwZWN0b3IuQnJl YWtwb2ludEl0ZW0ucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fYnJlYWtwb2lu dC5jb21wYXJlVG8ob3RoZXIuX2JyZWFrcG9pbnQpOwogICAgIH0sCiAKLSAgICByZW1vdmU6IGZ1 bmN0aW9uKCkKKyAgICBjbGljazogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlz Ll9icmVha3BvaW50LnJlbW92ZSgpOworICAgICAgICB0aGlzLl9icmVha3BvaW50LmNsaWNrKGV2 ZW50KTsKICAgICB9LAogCi0gICAgX2JyZWFrcG9pbnRDbGlja2VkOiBmdW5jdGlvbihldmVudCkK KyAgICBwb3B1bGF0ZUVkaXRFbGVtZW50OiBmdW5jdGlvbihlbGVtZW50KQogICAgIHsKLSAgICAg ICAgaWYgKCJjbGljayIgaW4gdGhpcy5fYnJlYWtwb2ludCkKLSAgICAgICAgICAgIHRoaXMuX2Jy ZWFrcG9pbnQuY2xpY2soKTsKKyAgICAgICAgdGhpcy5fYnJlYWtwb2ludC5wb3B1bGF0ZUVkaXRF bGVtZW50KGVsZW1lbnQpOworICAgIH0sCisKKyAgICByZW1vdmU6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIHRoaXMuX2JyZWFrcG9pbnQucmVtb3ZlKCk7CiAgICAgfSwKIAogICAgIF9jaGVj a2JveENsaWNrZWQ6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtMjAyLDQxICsyMjIsMjMgQEAgV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnRJdGVtLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJicmVha3BvaW50LWhpdCIpOwogICAgICAgICB9IGVsc2UK ICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiYnJlYWtwb2ludC1o aXQiKTsKLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rvci5CcmVha3BvaW50SXRlbS5wcm90b3R5cGUu X19wcm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7Ci0KLVdlYkluc3BlY3Rv ci5KU0JyZWFrcG9pbnRJdGVtID0gZnVuY3Rpb24oYnJlYWtwb2ludCkKLXsKLSAgICBXZWJJbnNw ZWN0b3IuQnJlYWtwb2ludEl0ZW0uY2FsbCh0aGlzLCBicmVha3BvaW50KTsKLQotICAgIHZhciBk aXNwbGF5TmFtZSA9IHRoaXMuX2JyZWFrcG9pbnQudXJsID8gV2ViSW5zcGVjdG9yLmRpc3BsYXlO YW1lRm9yVVJMKHRoaXMuX2JyZWFrcG9pbnQudXJsKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygi KHByb2dyYW0pIik7Ci0gICAgdmFyIGxhYmVsRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZVRleHRO b2RlKGRpc3BsYXlOYW1lICsgIjoiICsgdGhpcy5fYnJlYWtwb2ludC5saW5lKTsKLSAgICB0aGlz Ll9lbGVtZW50LmFwcGVuZENoaWxkKGxhYmVsRWxlbWVudCk7Ci0KLSAgICB2YXIgc291cmNlVGV4 dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICBzb3VyY2VUZXh0 RWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuX2JyZWFrcG9pbnQuc291cmNlVGV4dDsKLSAgICBz b3VyY2VUZXh0RWxlbWVudC5jbGFzc05hbWUgPSAic291cmNlLXRleHQgbW9ub3NwYWNlIjsKLSAg ICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKHNvdXJjZVRleHRFbGVtZW50KTsKLQotICAgIHRo aXMuX2JyZWFrcG9pbnQuYWRkRXZlbnRMaXN0ZW5lcigidGV4dC1jaGFuZ2VkIiwgdGhpcy5fdGV4 dENoYW5nZWQsIHRoaXMpOwotfQorICAgIH0sCiAKLVdlYkluc3BlY3Rvci5KU0JyZWFrcG9pbnRJ dGVtLnByb3RvdHlwZSA9IHsKLSAgICBfYnJlYWtwb2ludENsaWNrZWQ6IGZ1bmN0aW9uKCkKKyAg ICBfbGFiZWxDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIFdlYkluc3Bl Y3Rvci5wYW5lbHMuc2NyaXB0cy5zaG93U291cmNlTGluZSh0aGlzLl9icmVha3BvaW50LnVybCwg dGhpcy5fYnJlYWtwb2ludC5saW5lKTsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5yZW1vdmVDaGls ZCh0aGlzLl9sYWJlbEVsZW1lbnQpOworICAgICAgICB0aGlzLl9jcmVhdGVMYWJlbEVsZW1lbnQo KTsKICAgICB9LAogCi0gICAgX3RleHRDaGFuZ2VkOiBmdW5jdGlvbigpCisgICAgX2NyZWF0ZUxh YmVsRWxlbWVudDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIHNvdXJjZVRleHRFbGVt ZW50ID0gdGhpcy5fZWxlbWVudC5maXJzdENoaWxkLm5leHRTaWJsaW5nLm5leHRTaWJsaW5nOwot ICAgICAgICBzb3VyY2VUZXh0RWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuX2JyZWFrcG9pbnQu c291cmNlVGV4dDsKKyAgICAgICAgdGhpcy5fbGFiZWxFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgic3BhbiIpOworICAgICAgICB0aGlzLl9icmVha3BvaW50LnBvcHVsYXRlTGFiZWxF bGVtZW50KHRoaXMuX2xhYmVsRWxlbWVudCk7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fbGFiZWxFbGVtZW50KTsKICAgICB9CiB9CiAKLVdlYkluc3BlY3Rvci5KU0Jy ZWFrcG9pbnRJdGVtLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQnJlYWtwb2lu dEl0ZW0ucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRJdGVtLnByb3RvdHlwZS5f X3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKIAogV2ViSW5zcGVjdG9y LkV2ZW50TGlzdGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lID0gZnVuY3Rpb24oKQogewpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggMGFkMTJmNS4uYjY5Mjlm NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwor KysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xOTAsNyAr MTkwLDcgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAgICAgdmFyIHBhbmUgPSBuZXcgV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnRzU2lkZWJhclBhbmUoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJC cmVha3BvaW50cyIpKTsKICAgICAgICAgZnVuY3Rpb24gYnJlYWtwb2ludEFkZGVkKGV2ZW50KQog ICAgICAgICB7Ci0gICAgICAgICAgICBwYW5lLmFkZEJyZWFrcG9pbnQobmV3IFdlYkluc3BlY3Rv ci5KU0JyZWFrcG9pbnRJdGVtKGV2ZW50LmRhdGEpKTsKKyAgICAgICAgICAgIHBhbmUuYWRkQnJl YWtwb2ludEl0ZW0obmV3IFdlYkluc3BlY3Rvci5CcmVha3BvaW50SXRlbShldmVudC5kYXRhKSk7 CiAgICAgICAgIH0KICAgICAgICAgV2ViSW5zcGVjdG9yLmJyZWFrcG9pbnRNYW5hZ2VyLmFkZEV2 ZW50TGlzdGVuZXIoImJyZWFrcG9pbnQtYWRkZWQiLCBicmVha3BvaW50QWRkZWQpOwogICAgICAg ICByZXR1cm4gcGFuZTsKQEAgLTIwMSw3ICsyMDEsNyBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewog ICAgICAgICB2YXIgcGFuZSA9IG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludHNTaWRlYmFyUGFu ZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRPTSBCcmVha3BvaW50cyIpKTsKICAgICAgICAgZnVu Y3Rpb24gYnJlYWtwb2ludEFkZGVkKGV2ZW50KQogICAgICAgICB7Ci0gICAgICAgICAgICBwYW5l LmFkZEJyZWFrcG9pbnQobmV3IFdlYkluc3BlY3Rvci5CcmVha3BvaW50SXRlbShldmVudC5kYXRh KSk7CisgICAgICAgICAgICBwYW5lLmFkZEJyZWFrcG9pbnRJdGVtKG5ldyBXZWJJbnNwZWN0b3Iu QnJlYWtwb2ludEl0ZW0oZXZlbnQuZGF0YSkpOwogICAgICAgICB9CiAgICAgICAgIFdlYkluc3Bl Y3Rvci5icmVha3BvaW50TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKCJkb20tYnJlYWtwb2ludC1h ZGRlZCIsIGJyZWFrcG9pbnRBZGRlZCk7CiAgICAgICAgIHJldHVybiBwYW5lOwpAQCAtMjEyLDcg KzIxMiw3IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgICAgIHZhciBwYW5lID0gbmV3IFdl Ykluc3BlY3Rvci5YSFJCcmVha3BvaW50c1NpZGViYXJQYW5lKCk7CiAgICAgICAgIGZ1bmN0aW9u IGJyZWFrcG9pbnRBZGRlZChldmVudCkKICAgICAgICAgewotICAgICAgICAgICAgcGFuZS5hZGRC cmVha3BvaW50KG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludEl0ZW0oZXZlbnQuZGF0YSkpOwor ICAgICAgICAgICAgcGFuZS5hZGRCcmVha3BvaW50SXRlbShuZXcgV2ViSW5zcGVjdG9yLkJyZWFr cG9pbnRJdGVtKGV2ZW50LmRhdGEpKTsKICAgICAgICAgfQogICAgICAgICBXZWJJbnNwZWN0b3Iu YnJlYWtwb2ludE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcigieGhyLWJyZWFrcG9pbnQtYWRkZWQi LCBicmVha3BvaW50QWRkZWQpOwogICAgICAgICByZXR1cm4gcGFuZTsK