73087 2011-11-24 10:50:00 -0800 Web Inspector: Split scripts panel top status bar into debug toolbar and editor toolbar. 2011-11-25 02:33:36 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 73086 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 508838 0 vsevik 2011-11-24 10:50:00 -0800 Split scripts panel top status bar into debug toolbar and editor toolbar. 508852 1 116527 vsevik 2011-11-24 11:58:12 -0800 Created attachment 116527 Patch 509053 2 116527 webkit.review.bot 2011-11-25 02:33:31 -0800 Comment on attachment 116527 Patch Clearing flags on attachment: 116527 Committed r101160: <http://trac.webkit.org/changeset/101160> 509054 3 webkit.review.bot 2011-11-25 02:33:36 -0800 All reviewed patches have been landed. Closing bug. 116527 2011-11-24 11:58:12 -0800 2011-11-25 02:33:31 -0800 Patch bug-73087-20111124235810.patch text/plain 15603 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNiYjc0YTc4N2ZiNmYy ZGEzZjE5ZjAyNjRiZTM2YWY2ZDQ4ODM3Zi4uOTA1ZGQ0NjM3YTk4MTFhOTU4MGQ4ZmU2Mjk5Y2Q3 MDAxYmQ1OGQ3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTExLTI0ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNwbGl0IHNjcmlwdHMgcGFuZWwgdG9wIHN0YXR1cyBiYXIgaW50byBkZWJ1ZyB0b29sYmFy IGFuZCBlZGl0b3IgdG9vbGJhci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTczMDg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9yZXNldCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fY3JlYXRlRWRpdG9yVG9vbGJh cik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fY3JlYXRl RGVidWdUb29sYmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLl9jcmVhdGVCdXR0b25BbmRSZWdpc3RlclNob3J0Y3V0cyk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9zY3JpcHRzUGFuZWwuY3NzOgorICAgICAgICAoI3NjcmlwdHMtZGVidWct dG9vbGJhcik6CisgICAgICAgICgjc2NyaXB0cy1lZGl0b3ItdG9vbGJhcik6CisgICAgICAgICgj c2NyaXB0cy1kZWJ1Zy1zaWRlYmFyLXJlc2l6ZXItd2lkZ2V0KToKKyAgICAgICAgKC5zY3JpcHQt dmlldyk6CisKIDIwMTEtMTEtMjQgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9A bm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gR2V0IHJpZCBvZiB0aGUgYnVpbGREaXJGb3JTb3Vy Y2UoKSBmdW5jdGlvbiBpbiB0aGUgYnVpbGQgc3lzdGVtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGNmZGIxYmFjZmI0Y2My ZTFmZmVlZGVmYmJmYmVhMWNmZjlkZWZhYTguLjU3YTVmNDM2ZTg1ZTk5NWI5NzNkZmM4YmIyNTg4 NGRhMTAzMjIxMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCkBAIC00Myw1MyArNDMsOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwpCiAgICAgfQogICAgIFdlYkluc3Bl Y3Rvci5Hb1RvTGluZURpYWxvZy5pbnN0YWxsKHRoaXMsIHZpZXdHZXR0ZXIuYmluZCh0aGlzKSk7 CiAKLSAgICB0aGlzLnRvcFN0YXR1c0JhciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwotICAgIHRoaXMudG9wU3RhdHVzQmFyLmNsYXNzTmFtZSA9ICJzdGF0dXMtYmFyIjsKLSAgICB0 aGlzLnRvcFN0YXR1c0Jhci5pZCA9ICJzY3JpcHRzLXN0YXR1cy1iYXIiOwotICAgIHRoaXMuZWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLnRvcFN0YXR1c0Jhcik7Ci0KLSAgICB0aGlzLmJhY2tCdXR0 b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKLSAgICB0aGlzLmJhY2tCdXR0 b24uY2xhc3NOYW1lID0gInN0YXR1cy1iYXItaXRlbSI7Ci0gICAgdGhpcy5iYWNrQnV0dG9uLmlk ID0gInNjcmlwdHMtYmFjayI7Ci0gICAgdGhpcy5iYWNrQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJTaG93IHRoZSBwcmV2aW91cyBzY3JpcHQgcmVzb3VyY2UuIik7Ci0gICAg dGhpcy5iYWNrQnV0dG9uLmRpc2FibGVkID0gdHJ1ZTsKLSAgICB0aGlzLmJhY2tCdXR0b24uYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIikpOwotICAgIHRoaXMuYmFja0J1 dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2dvQmFjay5iaW5kKHRoaXMpLCBm YWxzZSk7Ci0gICAgdGhpcy50b3BTdGF0dXNCYXIuYXBwZW5kQ2hpbGQodGhpcy5iYWNrQnV0dG9u KTsKLQotICAgIHRoaXMuZm9yd2FyZEJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1 dHRvbiIpOwotICAgIHRoaXMuZm9yd2FyZEJ1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1p dGVtIjsKLSAgICB0aGlzLmZvcndhcmRCdXR0b24uaWQgPSAic2NyaXB0cy1mb3J3YXJkIjsKLSAg ICB0aGlzLmZvcndhcmRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cg dGhlIG5leHQgc2NyaXB0IHJlc291cmNlLiIpOwotICAgIHRoaXMuZm9yd2FyZEJ1dHRvbi5kaXNh YmxlZCA9IHRydWU7Ci0gICAgdGhpcy5mb3J3YXJkQnV0dG9uLmFwcGVuZENoaWxkKGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImltZyIpKTsKLSAgICB0aGlzLmZvcndhcmRCdXR0b24uYWRkRXZlbnRM aXN0ZW5lcigiY2xpY2siLCB0aGlzLl9nb0ZvcndhcmQuYmluZCh0aGlzKSwgZmFsc2UpOwotICAg IHRoaXMudG9wU3RhdHVzQmFyLmFwcGVuZENoaWxkKHRoaXMuZm9yd2FyZEJ1dHRvbik7Ci0KLSAg ICB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzZWxl Y3QiKTsKLSAgICB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQuY2xhc3NOYW1lID0gInN0YXR1cy1i YXItaXRlbSI7Ci0gICAgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LmlkID0gInNjcmlwdHMtZmls ZXMiOwotICAgIHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjaGFu Z2UiLCB0aGlzLl9maWxlc1NlbGVjdENoYW5nZWQuYmluZCh0aGlzLCB0cnVlKSwgZmFsc2UpOwot ICAgIHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXl1cCIsIHRo aXMuX2ZpbGVzU2VsZWN0Q2hhbmdlZC5iaW5kKHRoaXMsIGZhbHNlKSwgZmFsc2UpOwotICAgIHRo aXMudG9wU3RhdHVzQmFyLmFwcGVuZENoaWxkKHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudCk7Ci0K LSAgICB0aGlzLmZ1bmN0aW9uc1NlbGVjdEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzZWxlY3QiKTsKLSAgICB0aGlzLmZ1bmN0aW9uc1NlbGVjdEVsZW1lbnQuY2xhc3NOYW1lID0g InN0YXR1cy1iYXItaXRlbSI7Ci0gICAgdGhpcy5mdW5jdGlvbnNTZWxlY3RFbGVtZW50LmlkID0g InNjcmlwdHMtZnVuY3Rpb25zIjsKLQotICAgIC8vIEZJWE1FOiBhcHBlbmQgdGhlIGZ1bmN0aW9u cyBzZWxlY3QgZWxlbWVudCB0byB0aGUgdG9wIHN0YXR1cyBiYXIgd2hlbiBpdCBpcyBpbXBsZW1l bnRlZC4KLSAgICAvLyB0aGlzLnRvcFN0YXR1c0Jhci5hcHBlbmRDaGlsZCh0aGlzLmZ1bmN0aW9u c1NlbGVjdEVsZW1lbnQpOwotCi0gICAgdGhpcy5fY3JlYXRlU2lkZWJhckJ1dHRvbnMoKTsKLQot ICAgIHRoaXMudG9nZ2xlQnJlYWtwb2ludHNCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1 c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRlYWN0aXZhdGUgYWxsIGJyZWFrcG9p bnRzLiIpLCAidG9nZ2xlLWJyZWFrcG9pbnRzIik7Ci0gICAgdGhpcy50b2dnbGVCcmVha3BvaW50 c0J1dHRvbi50b2dnbGVkID0gdHJ1ZTsKLSAgICB0aGlzLnRvZ2dsZUJyZWFrcG9pbnRzQnV0dG9u LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlQnJlYWtwb2ludHNDbGlja2Vk LCB0aGlzKTsKLSAgICB0aGlzLnNpZGViYXJCdXR0b25zRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz LnRvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLmVsZW1lbnQpOwotCi0gICAgdGhpcy5kZWJ1Z2dlclN0 YXR1c0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLmRl YnVnZ2VyU3RhdHVzRWxlbWVudC5pZCA9ICJzY3JpcHRzLWRlYnVnZ2VyLXN0YXR1cyI7Ci0gICAg dGhpcy5zaWRlYmFyQnV0dG9uc0VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5kZWJ1Z2dlclN0YXR1 c0VsZW1lbnQpOworICAgIHRoaXMuZWRpdG9yVG9vbGJhciA9IHRoaXMuX2NyZWF0ZUVkaXRvclRv b2xiYXIoKTsKKyAgICB0aGlzLmRlYnVnVG9vbGJhciA9IHRoaXMuX2NyZWF0ZURlYnVnVG9vbGJh cigpOwogCiAgICAgY29uc3QgaW5pdGlhbFNpZGViYXJXaWR0aCA9IDIyNTsKICAgICBjb25zdCBt aW5pbWFsVmlld3NDb250YWluZXJXaWR0aFBlcmNlbnQgPSAzNDsKQEAgLTk4LDEyICs1MywxNSBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwp CiAgICAgdGhpcy5zcGxpdFZpZXcubWluaW1hbFNpZGViYXJXaWR0aCA9IFByZWZlcmVuY2VzLm1p blNjcmlwdHNTaWRlYmFyV2lkdGg7CiAgICAgdGhpcy5zcGxpdFZpZXcubWluaW1hbE1haW5XaWR0 aFBlcmNlbnQgPSBtaW5pbWFsVmlld3NDb250YWluZXJXaWR0aFBlcmNlbnQ7CiAKKyAgICB0aGlz LnNwbGl0Vmlldy5zaWRlYmFyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmRlYnVnVG9vbGJhcik7 CisgICAgdGhpcy5zcGxpdFZpZXcubWFpbkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5lZGl0b3JU b29sYmFyKTsKKwogICAgIHRoaXMudmlld3NDb250YWluZXJFbGVtZW50ID0gdGhpcy5zcGxpdFZp ZXcubWFpbkVsZW1lbnQ7CiAKLSAgICB0aGlzLnNpZGViYXJSZXNpemVXaWRnZXRFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5zaWRlYmFyUmVzaXplV2lk Z2V0RWxlbWVudC5pZCA9ICJzY3JpcHRzLXNpZGViYXItcmVzaXplci13aWRnZXQiOwotICAgIHRo aXMuc3BsaXRWaWV3Lmluc3RhbGxSZXNpemVyKHRoaXMuc2lkZWJhclJlc2l6ZVdpZGdldEVsZW1l bnQpOwotICAgIHRoaXMudG9wU3RhdHVzQmFyLmFwcGVuZENoaWxkKHRoaXMuc2lkZWJhclJlc2l6 ZVdpZGdldEVsZW1lbnQpOworICAgIHRoaXMuZGVidWdTaWRlYmFyUmVzaXplV2lkZ2V0RWxlbWVu dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuZGVidWdTaWRlYmFy UmVzaXplV2lkZ2V0RWxlbWVudC5pZCA9ICJzY3JpcHRzLWRlYnVnLXNpZGViYXItcmVzaXplci13 aWRnZXQiOworICAgIHRoaXMuc3BsaXRWaWV3Lmluc3RhbGxSZXNpemVyKHRoaXMuZGVidWdTaWRl YmFyUmVzaXplV2lkZ2V0RWxlbWVudCk7CisgICAgdGhpcy5lZGl0b3JUb29sYmFyLmFwcGVuZENo aWxkKHRoaXMuZGVidWdTaWRlYmFyUmVzaXplV2lkZ2V0RWxlbWVudCk7CiAKICAgICB0aGlzLnNp ZGViYXJQYW5lcyA9IHt9OwogICAgIHRoaXMuc2lkZWJhclBhbmVzLndhdGNoRXhwcmVzc2lvbnMg PSBuZXcgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFuZSgpOwpAQCAtNTUw LDcgKzUwOCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICBkZWxldGUgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LmluaXRpYWxTZWxlY3Rpb25Qcm9j ZXNzZWQ7CiAKICAgICAgICAgdGhpcy5mdW5jdGlvbnNTZWxlY3RFbGVtZW50LnJlbW92ZUNoaWxk cmVuKCk7Ci0gICAgICAgIHRoaXMudmlld3NDb250YWluZXJFbGVtZW50LnJlbW92ZUNoaWxkcmVu KCk7CisgICAgICAgIHRoaXMudmlzaWJsZVZpZXcgPSBudWxsOwogCiAgICAgICAgIHRoaXMuc2lk ZWJhclBhbmVzLmpzQnJlYWtwb2ludHMucmVzZXQoKTsKICAgICAgICAgdGhpcy5zaWRlYmFyUGFu ZXMud2F0Y2hFeHByZXNzaW9ucy5yZXNldCgpOwpAQCAtNzczLDE0ICs3MzEsNiBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHNvdXJjZUZyYW1l LmZvY3VzKCk7CiAgICAgfSwKIAotICAgIHNpZGViYXJSZXNpemVkOiBmdW5jdGlvbihldmVudCkK LSAgICB7Ci0gICAgICAgIHZhciB3aWR0aCA9IGV2ZW50LmRhdGE7Ci0KLSAgICAgICAgdGhpcy5z aWRlYmFyQnV0dG9uc0VsZW1lbnQuc3R5bGUud2lkdGggPSB3aWR0aCArICJweCI7Ci0gICAgICAg IHRoaXMuc2lkZWJhclJlc2l6ZVdpZGdldEVsZW1lbnQuc3R5bGUucmlnaHQgPSB3aWR0aCArICJw eCI7Ci0gICAgfSwKLQogICAgIF9zZXRQYXVzZU9uRXhjZXB0aW9uczogZnVuY3Rpb24ocGF1c2VP bkV4Y2VwdGlvbnNTdGF0ZSkKICAgICB7CiAgICAgICAgIHBhdXNlT25FeGNlcHRpb25zU3RhdGUg PSBwYXVzZU9uRXhjZXB0aW9uc1N0YXRlIHx8IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuUGF1 c2VPbkV4Y2VwdGlvbnNTdGF0ZS5Eb250UGF1c2VPbkV4Y2VwdGlvbnM7CkBAIC0xMDAzLDEyICs5 NTMsNTQgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICBXZWJJbnNwZWN0b3IuZXZhbHVhdGVJbkNvbnNvbGUoc2VsZWN0aW9uLnRvU3RyaW5nKCkp OwogICAgIH0sCiAKLSAgICBfY3JlYXRlU2lkZWJhckJ1dHRvbnM6IGZ1bmN0aW9uKCkKLSAgICB7 Ci0gICAgICAgIHRoaXMuc2lkZWJhckJ1dHRvbnNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7Ci0gICAgICAgIHRoaXMuc2lkZWJhckJ1dHRvbnNFbGVtZW50LmlkID0gInNj cmlwdHMtc2lkZWJhci1idXR0b25zIjsKLSAgICAgICAgdGhpcy50b3BTdGF0dXNCYXIuYXBwZW5k Q2hpbGQodGhpcy5zaWRlYmFyQnV0dG9uc0VsZW1lbnQpOwotCisgICAgX2NyZWF0ZUVkaXRvclRv b2xiYXI6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBlZGl0b3JUb29sYmFyID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGVkaXRvclRvb2xiYXIuY2xhc3NO YW1lID0gInN0YXR1cy1iYXIiOworICAgICAgICBlZGl0b3JUb29sYmFyLmlkID0gInNjcmlwdHMt ZWRpdG9yLXRvb2xiYXIiOworCisgICAgICAgIHRoaXMuYmFja0J1dHRvbiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOworICAgICAgICB0aGlzLmJhY2tCdXR0b24uY2xhc3NOYW1l ID0gInN0YXR1cy1iYXItaXRlbSI7CisgICAgICAgIHRoaXMuYmFja0J1dHRvbi5pZCA9ICJzY3Jp cHRzLWJhY2siOworICAgICAgICB0aGlzLmJhY2tCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlNob3cgdGhlIHByZXZpb3VzIHNjcmlwdCByZXNvdXJjZS4iKTsKKyAgICAgICAg dGhpcy5iYWNrQnV0dG9uLmRpc2FibGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5iYWNrQnV0dG9u LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpKTsKKyAgICAgICAgdGhp cy5iYWNrQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZ29CYWNrLmJpbmQo dGhpcyksIGZhbHNlKTsKKyAgICAgICAgZWRpdG9yVG9vbGJhci5hcHBlbmRDaGlsZCh0aGlzLmJh Y2tCdXR0b24pOworCisgICAgICAgIHRoaXMuZm9yd2FyZEJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImJ1dHRvbiIpOworICAgICAgICB0aGlzLmZvcndhcmRCdXR0b24uY2xhc3NOYW1l ID0gInN0YXR1cy1iYXItaXRlbSI7CisgICAgICAgIHRoaXMuZm9yd2FyZEJ1dHRvbi5pZCA9ICJz Y3JpcHRzLWZvcndhcmQiOworICAgICAgICB0aGlzLmZvcndhcmRCdXR0b24udGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgdGhlIG5leHQgc2NyaXB0IHJlc291cmNlLiIpOworICAg ICAgICB0aGlzLmZvcndhcmRCdXR0b24uZGlzYWJsZWQgPSB0cnVlOworICAgICAgICB0aGlzLmZv cndhcmRCdXR0b24uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIikpOwor ICAgICAgICB0aGlzLmZvcndhcmRCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz Ll9nb0ZvcndhcmQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgICAgICBlZGl0b3JUb29sYmFyLmFw cGVuZENoaWxkKHRoaXMuZm9yd2FyZEJ1dHRvbik7CisKKyAgICAgICAgdGhpcy5fZmlsZXNTZWxl Y3RFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic2VsZWN0Iik7CisgICAgICAgIHRo aXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsKKyAg ICAgICAgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LmlkID0gInNjcmlwdHMtZmlsZXMiOworICAg ICAgICB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwg dGhpcy5fZmlsZXNTZWxlY3RDaGFuZ2VkLmJpbmQodGhpcywgdHJ1ZSksIGZhbHNlKTsKKyAgICAg ICAgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleXVwIiwgdGhp cy5fZmlsZXNTZWxlY3RDaGFuZ2VkLmJpbmQodGhpcywgZmFsc2UpLCBmYWxzZSk7CisgICAgICAg IGVkaXRvclRvb2xiYXIuYXBwZW5kQ2hpbGQodGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50KTsKKwor ICAgICAgICB0aGlzLmZ1bmN0aW9uc1NlbGVjdEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJzZWxlY3QiKTsKKyAgICAgICAgdGhpcy5mdW5jdGlvbnNTZWxlY3RFbGVtZW50LmNsYXNz TmFtZSA9ICJzdGF0dXMtYmFyLWl0ZW0iOworICAgICAgICB0aGlzLmZ1bmN0aW9uc1NlbGVjdEVs ZW1lbnQuaWQgPSAic2NyaXB0cy1mdW5jdGlvbnMiOworCisgICAgICAgIC8vIEZJWE1FOiBhcHBl bmQgdGhlIGZ1bmN0aW9ucyBzZWxlY3QgZWxlbWVudCB0byB0aGUgdG9wIHN0YXR1cyBiYXIgd2hl biBpdAorICAgICAgICAvLyBpcyBpbXBsZW1lbnRlZC4KKyAgICAgICAgLy8gZWRpdG9yVG9vbGJh ci5hcHBlbmRDaGlsZCh0aGlzLmZ1bmN0aW9uc1NlbGVjdEVsZW1lbnQpOworICAgICAgICAKKyAg ICAgICAgcmV0dXJuIGVkaXRvclRvb2xiYXI7CisgICAgfSwKKworICAgIF9jcmVhdGVEZWJ1Z1Rv b2xiYXI6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBkZWJ1Z1Rvb2xiYXIgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgZGVidWdUb29sYmFyLmNsYXNzTmFt ZSA9ICJzdGF0dXMtYmFyIjsKKyAgICAgICAgZGVidWdUb29sYmFyLmlkID0gInNjcmlwdHMtZGVi dWctdG9vbGJhciI7CisgICAgICAgIAogICAgICAgICB2YXIgdGl0bGUsIGhhbmRsZXIsIHNob3J0 Y3V0czsKICAgICAgICAgdmFyIHBsYXRmb3JtU3BlY2lmaWNNb2RpZmllciA9IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhOwogCkBAIC0xMDE4LDcgKzEw MTAsOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg c2hvcnRjdXRzID0gW107CiAgICAgICAgIHNob3J0Y3V0cy5wdXNoKFdlYkluc3BlY3Rvci5LZXli b2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 LktleXMuRjgpKTsKICAgICAgICAgc2hvcnRjdXRzLnB1c2goV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQubWFrZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5 cy5TbGFzaCwgcGxhdGZvcm1TcGVjaWZpY01vZGlmaWVyKSk7Ci0gICAgICAgIHRoaXMucGF1c2VC dXR0b24gPSB0aGlzLl9jcmVhdGVTaWRlYmFyQnV0dG9uQW5kUmVnaXN0ZXJTaG9ydGN1dHMoInNj cmlwdHMtcGF1c2UiLCB0aXRsZSwgaGFuZGxlciwgc2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlBhdXNlL0NvbnRpbnVlIikpOworICAgICAgICB0aGlzLnBhdXNlQnV0dG9uID0gdGhp cy5fY3JlYXRlQnV0dG9uQW5kUmVnaXN0ZXJTaG9ydGN1dHMoInNjcmlwdHMtcGF1c2UiLCB0aXRs ZSwgaGFuZGxlciwgc2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlL0NvbnRp bnVlIikpOworICAgICAgICBkZWJ1Z1Rvb2xiYXIuYXBwZW5kQ2hpbGQodGhpcy5wYXVzZUJ1dHRv bik7CiAKICAgICAgICAgLy8gU3RlcCBvdmVyLgogICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiU3RlcCBvdmVyIG5leHQgZnVuY3Rpb24gY2FsbCAoJXMpLiIpOwpAQCAtMTAy Niw3ICsxMDE5LDggQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHNob3J0Y3V0cyA9IFtdOwogICAgICAgICBzaG9ydGN1dHMucHVzaChXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5LZXlzLkYxMCkpOwogICAgICAgICBzaG9ydGN1dHMucHVzaChXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5LZXlzLlNpbmdsZVF1b3RlLCBwbGF0Zm9ybVNwZWNpZmljTW9kaWZpZXIpKTsKLSAgICAg ICAgdGhpcy5zdGVwT3ZlckJ1dHRvbiA9IHRoaXMuX2NyZWF0ZVNpZGViYXJCdXR0b25BbmRSZWdp c3RlclNob3J0Y3V0cygic2NyaXB0cy1zdGVwLW92ZXIiLCB0aXRsZSwgaGFuZGxlciwgc2hvcnRj dXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3ZlciIpKTsKKyAgICAgICAgdGhpcy5z dGVwT3ZlckJ1dHRvbiA9IHRoaXMuX2NyZWF0ZUJ1dHRvbkFuZFJlZ2lzdGVyU2hvcnRjdXRzKCJz Y3JpcHRzLXN0ZXAtb3ZlciIsIHRpdGxlLCBoYW5kbGVyLCBzaG9ydGN1dHMsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiU3RlcCBvdmVyIikpOworICAgICAgICBkZWJ1Z1Rvb2xiYXIuYXBwZW5kQ2hp bGQodGhpcy5zdGVwT3ZlckJ1dHRvbik7CiAKICAgICAgICAgLy8gU3RlcCBpbnRvLgogICAgICAg ICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBpbnRvIG5leHQgZnVuY3Rpb24g Y2FsbCAoJXMpLiIpOwpAQCAtMTAzNCw3ICsxMDI4LDggQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHNob3J0Y3V0cyA9IFtdOwogICAgICAgICBzaG9y dGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkYxMSkpOwogICAgICAgICBzaG9ydGN1 dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlNlbWljb2xvbiwgcGxhdGZvcm1TcGVjaWZp Y01vZGlmaWVyKSk7Ci0gICAgICAgIHRoaXMuc3RlcEludG9CdXR0b24gPSB0aGlzLl9jcmVhdGVT aWRlYmFyQnV0dG9uQW5kUmVnaXN0ZXJTaG9ydGN1dHMoInNjcmlwdHMtc3RlcC1pbnRvIiwgdGl0 bGUsIGhhbmRsZXIsIHNob3J0Y3V0cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIGludG8i KSk7CisgICAgICAgIHRoaXMuc3RlcEludG9CdXR0b24gPSB0aGlzLl9jcmVhdGVCdXR0b25BbmRS ZWdpc3RlclNob3J0Y3V0cygic2NyaXB0cy1zdGVwLWludG8iLCB0aXRsZSwgaGFuZGxlciwgc2hv cnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgaW50byIpKTsKKyAgICAgICAgZGVi dWdUb29sYmFyLmFwcGVuZENoaWxkKHRoaXMuc3RlcEludG9CdXR0b24pOwogCiAgICAgICAgIC8v IFN0ZXAgb3V0LgogICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBv dXQgb2YgY3VycmVudCBmdW5jdGlvbiAoJXMpLiIpOwpAQCAtMTA0MiwxMCArMTAzNywyMiBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgc2hvcnRjdXRz ID0gW107CiAgICAgICAgIHNob3J0Y3V0cy5wdXNoKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRjEx LCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllcnMuU2hpZnQpKTsKICAgICAg ICAgc2hvcnRjdXRzLnB1c2goV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZURlc2Ny aXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5TZW1pY29sb24sIFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5TaGlmdCB8IHBsYXRmb3JtU3BlY2lm aWNNb2RpZmllcikpOwotICAgICAgICB0aGlzLnN0ZXBPdXRCdXR0b24gPSB0aGlzLl9jcmVhdGVT aWRlYmFyQnV0dG9uQW5kUmVnaXN0ZXJTaG9ydGN1dHMoInNjcmlwdHMtc3RlcC1vdXQiLCB0aXRs ZSwgaGFuZGxlciwgc2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3V0Iikp OworICAgICAgICB0aGlzLnN0ZXBPdXRCdXR0b24gPSB0aGlzLl9jcmVhdGVCdXR0b25BbmRSZWdp c3RlclNob3J0Y3V0cygic2NyaXB0cy1zdGVwLW91dCIsIHRpdGxlLCBoYW5kbGVyLCBzaG9ydGN1 dHMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBvdXQiKSk7CisgICAgICAgIGRlYnVnVG9v bGJhci5hcHBlbmRDaGlsZCh0aGlzLnN0ZXBPdXRCdXR0b24pOworICAgICAgICAKKyAgICAgICAg dGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFy QnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVhY3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMu IiksICJ0b2dnbGUtYnJlYWtwb2ludHMiKTsKKyAgICAgICAgdGhpcy50b2dnbGVCcmVha3BvaW50 c0J1dHRvbi50b2dnbGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy50b2dnbGVCcmVha3BvaW50c0J1 dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQ2xp Y2tlZCwgdGhpcyk7CisgICAgICAgIGRlYnVnVG9vbGJhci5hcHBlbmRDaGlsZCh0aGlzLnRvZ2ds ZUJyZWFrcG9pbnRzQnV0dG9uLmVsZW1lbnQpOworCisgICAgICAgIHRoaXMuZGVidWdnZXJTdGF0 dXNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIHRoaXMu ZGVidWdnZXJTdGF0dXNFbGVtZW50LmlkID0gInNjcmlwdHMtZGVidWdnZXItc3RhdHVzIjsKKyAg ICAgICAgZGVidWdUb29sYmFyLmFwcGVuZENoaWxkKHRoaXMuZGVidWdnZXJTdGF0dXNFbGVtZW50 KTsKKyAgICAgICAgCisgICAgICAgIHJldHVybiBkZWJ1Z1Rvb2xiYXI7CiAgICAgfSwKIAotICAg IF9jcmVhdGVTaWRlYmFyQnV0dG9uQW5kUmVnaXN0ZXJTaG9ydGN1dHM6IGZ1bmN0aW9uKGJ1dHRv bklkLCBidXR0b25UaXRsZSwgaGFuZGxlciwgc2hvcnRjdXRzLCBzaG9ydGN1dERlc2NyaXB0aW9u KQorICAgIF9jcmVhdGVCdXR0b25BbmRSZWdpc3RlclNob3J0Y3V0czogZnVuY3Rpb24oYnV0dG9u SWQsIGJ1dHRvblRpdGxlLCBoYW5kbGVyLCBzaG9ydGN1dHMsIHNob3J0Y3V0RGVzY3JpcHRpb24p CiAgICAgewogICAgICAgICB2YXIgYnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0 dG9uIik7CiAgICAgICAgIGJ1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsKQEAg LTEwNTQsNyArMTA2MSw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICBidXR0b24uZGlzYWJsZWQgPSB0cnVlOwogICAgICAgICBidXR0b24uYXBwZW5k Q2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIikpOwogICAgICAgICBidXR0b24uYWRk RXZlbnRMaXN0ZW5lcigiY2xpY2siLCBoYW5kbGVyLCBmYWxzZSk7Ci0gICAgICAgIHRoaXMuc2lk ZWJhckJ1dHRvbnNFbGVtZW50LmFwcGVuZENoaWxkKGJ1dHRvbik7CiAKICAgICAgICAgdmFyIHNo b3J0Y3V0TmFtZXMgPSBbXTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzaG9ydGN1dHMu bGVuZ3RoOyArK2kpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvc2NyaXB0c1BhbmVsLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvc2NyaXB0c1BhbmVsLmNzcwppbmRleCBhY2IxZjI5NTRiYTI2MzlmOGY5YTkzZjgxODMyYTZm ODdhM2YxOWIxLi5mMWExZmFkMjJmZDQyNDE3MDhiMjg0NzhlY2VhOWVjNDk2OTBhM2Q1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NjcmlwdHNQYW5lbC5j c3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zY3JpcHRzUGFuZWwu Y3NzCkBAIC00NywxMSArNDcsMTUgQEAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoNjYsIDEy OSwgMjM1KTsKIH0KIAotI3NjcmlwdHMtc3RhdHVzLWJhciB7Ci0gICAgcG9zaXRpb246IGFic29s dXRlOwotICAgIHRvcDogLTFweDsKLSAgICBsZWZ0OiAwOwotICAgIHJpZ2h0OiAwOworI3Njcmlw dHMtZGVidWctdG9vbGJhciB7CisgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgIG1hcmdpbi10 b3A6IC0xcHg7CisgICAgaGVpZ2h0OiAyM3B4OworfQorCisjc2NyaXB0cy1lZGl0b3ItdG9vbGJh ciB7CisgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgIG1hcmdpbi10b3A6IC0xcHg7CiAgICAg aGVpZ2h0OiAyNHB4OwogfQogCkBAIC0xMTYsMTEgKzEyMCwxMSBAQAogICAgIHJpZ2h0OiA4cHg7 CiB9CiAKLSNzY3JpcHRzLXNpZGViYXItcmVzaXplci13aWRnZXQgeworI3NjcmlwdHMtZGVidWct c2lkZWJhci1yZXNpemVyLXdpZGdldCB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRv cDogMDsKICAgICBib3R0b206IDA7Ci0gICAgcmlnaHQ6IDIyNXB4OworICAgIHJpZ2h0OiAwOwog ICAgIHdpZHRoOiAxNnB4OwogICAgIGN1cnNvcjogZXctcmVzaXplOwogICAgIGJhY2tncm91bmQt aW1hZ2U6IHVybChJbWFnZXMvc3RhdHVzYmFyUmVzaXplckhvcml6b250YWwucG5nKTsKQEAgLTEy OCwyMSArMTMyLDExIEBACiAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyOwogfQogCi0j c2NyaXB0cy1zaWRlYmFyLWJ1dHRvbnMgewotICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICBy aWdodDogMDsKLSAgICB0b3A6IDA7Ci0gICAgYm90dG9tOiAwOwotICAgIHdpZHRoOiAyMjVweDsK LSAgICBvdmVyZmxvdzogaGlkZGVuOwotICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDY0 JSwgNjQlLCA2NCUpOwotfQotCiAuc2NyaXB0LXZpZXcgewogICAgIGRpc3BsYXk6IG5vbmU7CiAg ICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgdG9wOiAw OworICAgIHRvcDogMjNweDsKICAgICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwogICAgIGJvdHRv bTogMDsKQEAgLTE1MiwxMCArMTQ2LDYgQEAKICAgICBkaXNwbGF5OiBibG9jazsKIH0KIAotI3Nj cmlwdHMtc3BsaXQtdmlldyB7Ci0gICAgdG9wOiAyM3B4OwotfQotCiAuZGVkaWNhdGVkLXdvcmtl ci1pdGVtIHsKICAgICBtYXJnaW46IDVweCAwcHggNXB4IDFweDsKIH0K