82614 2012-03-29 07:35:25 -0700 Web Inspector: Existing UISourceCode should be loaded on scripts panel creation/reset. 2012-03-29 08:24:09 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 591176 0 vsevik 2012-03-29 07:35:25 -0700 Existing UISourceCode should be loaded on scripts panel creation/reset. This is needed to show snippets that are loaded before scripts panel creation and are not removed on navigation. 591179 1 134580 vsevik 2012-03-29 07:39:16 -0700 Created attachment 134580 Patch 591209 2 vsevik 2012-03-29 08:24:09 -0700 Committed r112533: <http://trac.webkit.org/changeset/112533> 134580 2012-03-29 07:39:16 -0700 2012-03-29 07:41:33 -0700 Patch bug-82614-20120329183914.patch text/plain 15176 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRmNjczYjlmZmY3YjVk MDZiNmM3NWZkZjZmMDkyMjc3NDU3M2YwYy4uNGIyYmRmMDVmMWJiYjc1ZDM0MDA3Y2ZhYzIyNzQw ZDc1N2YzMGNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTI5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEV4aXN0aW5nIFVJU291cmNlQ29kZSBzaG91bGQgYmUgbG9hZGVkIG9uIHNjcmlwdHMgcGFu ZWwgY3JlYXRpb24vcmVzZXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04MjYxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVJU291cmNlQ29kZSBhcmUgbm93IGxvYWRlZCBmcm9tIERlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwgb24gc2NyaXB0cyBwYW5lbCBjcmVhdGlvbi9yZXNldC4KKyAgICAgICAgVGhp cyBpcyBuZWVkZWQgdG8gc2hvdyBzbmlwcGV0cyB0aGF0IGFyZSBsb2FkZWQgYmVmb3JlIHNjcmlw dHMgcGFuZWwgY3JlYXRpb24gYW5kIGFyZSBub3QgcmVtb3ZlZCBvbiBuYXZpZ2F0aW9uLgorCisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5faGFuZGxlVUlTb3VyY2VDb2RlQWRk ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2xvYWRV SVNvdXJjZUNvZGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLl91aVNvdXJjZUNvZGVBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5fcmVzZXQpOgorCiAyMDEyLTAzLTI5ICBaYWxhbiBCdWp0YXMgIDx6YnVq dGFzQGdtYWlsLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVkdW5kYW50IHVwZGF0ZVZpZXdwb3J0 QXJndW1lbnRzKCkgY2FsbCB3aGVuIHBhZ2UgaXMgcmVzdG9yZWQgZnJvbSBwYWdlIGNhY2hlLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5q cwppbmRleCA5ZjM0NDBiOWNjMzRkZjRlYWExNTM4ZDE4MzM3YzRmMTc3YzI5MzUxLi5mMTQzZTVi NTQ5OTIwNzQxNDgzYWE5MTcwYzFkYTAxMjkzM2Q4NTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTY3LDEyICsxNjcs MTMgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1v ZGVsKQogCiAgICAgdGhpcy5fZGVidWdnZXJFbmFibGVkID0gIUNhcGFiaWxpdGllcy5kZWJ1Z2dl ckNhdXNlc1JlY29tcGlsYXRpb247CiAKKyAgICB0aGlzLl9zb3VyY2VGcmFtZXNCeVVJU291cmNl Q29kZSA9IG5ldyBNYXAoKTsKICAgICB0aGlzLl9yZXNldChmYWxzZSk7CiAKICAgICBXZWJJbnNw ZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dl ck1vZGVsLkV2ZW50cy5EZWJ1Z2dlcldhc0VuYWJsZWQsIHRoaXMuX2RlYnVnZ2VyV2FzRW5hYmxl ZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuRGVidWdnZXJXYXNEaXNhYmxlZCwg dGhpcy5fZGVidWdnZXJXYXNEaXNhYmxlZCwgdGhpcyk7CiAKLSAgICB0aGlzLl9wcmVzZW50YXRp b25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLkV2ZW50cy5VSVNvdXJjZUNvZGVBZGRlZCwgdGhpcy5fdWlTb3VyY2VDb2RlQWRkZWQs IHRoaXMpCisgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuVUlTb3VyY2VDb2RlQWRk ZWQsIHRoaXMuX2hhbmRsZVVJU291cmNlQ29kZUFkZGVkLCB0aGlzKQogICAgIHRoaXMuX3ByZXNl bnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwuRXZlbnRzLlVJU291cmNlQ29kZVJlcGxhY2VkLCB0aGlzLl91aVNvdXJjZUNv ZGVSZXBsYWNlZCwgdGhpcyk7CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuVUlT b3VyY2VDb2RlUmVtb3ZlZCwgdGhpcy5fdWlTb3VyY2VDb2RlUmVtb3ZlZCwgdGhpcyk7CiAgICAg dGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRGVidWdnZXJQYXVzZWQsIHRoaXMuX2RlYnVn Z2VyUGF1c2VkLCB0aGlzKTsKQEAgLTE4Nyw4ICsxODgsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwpCiAgICAgICAgIFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmVuYWJsZURlYnVnZ2VyKCk7CiAKICAgICBXZWJJbnNwZWN0b3IuYWR2 YW5jZWRTZWFyY2hDb250cm9sbGVyLnJlZ2lzdGVyU2VhcmNoU2NvcGUobmV3IFdlYkluc3BlY3Rv ci5TY3JpcHRzU2VhcmNoU2NvcGUoKSk7Ci0KLSAgICB0aGlzLl9zb3VyY2VGcmFtZXNCeVVJU291 cmNlQ29kZSA9IG5ldyBNYXAoKTsKIH0KIAogLy8gS2VlcCB0aGVzZSBpbiBzeW5jIHdpdGggV2Vi Q29yZTo6U2NyaXB0RGVidWdTZXJ2ZXIKQEAgLTI1MSwxMCArMjUwLDI3IEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAotICAgIF91 aVNvdXJjZUNvZGVBZGRlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2hhbmRsZVVJU291cmNl Q29kZUFkZGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNv ZGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIGV2ZW50LmRhdGE7 CisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUFkZGVkKHVpU291cmNlQ29kZSk7CisgICAgfSwK IAorICAgIF9sb2FkVUlTb3VyY2VDb2RlczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFy IHVpU291cmNlQ29kZXMgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC51aVNvdXJjZUNvZGVzKCk7 CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdWlTb3VyY2VDb2Rlcy5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUFkZGVkKHVpU291cmNlQ29kZXNbaV0pOwor ICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGV9IHVpU291cmNlQ29kZQorICAgICAqLworICAgIF91aVNvdXJjZUNvZGVBZGRlZDogZnVuY3Rp b24odWlTb3VyY2VDb2RlKQorICAgIHsKICAgICAgICAgdmFyIGJyZWFrcG9pbnRzID0gdWlTb3Vy Y2VDb2RlLmJyZWFrcG9pbnRzKCk7CiAgICAgICAgIGZvciAodmFyIGxpbmVOdW1iZXIgaW4gYnJl YWtwb2ludHMpCiAgICAgICAgICAgICB0aGlzLl91aUJyZWFrcG9pbnRBZGRlZCh7IGRhdGE6IGJy ZWFrcG9pbnRzW2xpbmVOdW1iZXJdIH0pOwpAQCAtNDMwLDYgKzQ0Niw3IEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy53 YXRjaEV4cHJlc3Npb25zLnJlc2V0KCk7CiAgICAgICAgIGlmICghcHJlc2VydmVJdGVtcyAmJiB0 aGlzLnNpZGViYXJQYW5lcy53b3JrZXJzKQogICAgICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMu d29ya2Vycy5yZXNldCgpOworICAgICAgICB0aGlzLl9sb2FkVUlTb3VyY2VDb2RlcygpOwogICAg IH0sCiAKICAgICBnZXQgdmlzaWJsZVZpZXcoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDU3ODZiYTFiOWY2OGZjNWMwN2Zl MTY2OWU1OWE2ZDk0OWI5ZWUzYzIuLmU0MWMyMWJkMGRjMmJlMTNkN2ZkZmYwYzdhMGE5MDQzMmFl M2Y2YjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMy0yOSAgVnNldm9sb2QgVmxhc292 ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBFeGlzdGlu ZyBVSVNvdXJjZUNvZGUgc2hvdWxkIGJlIGxvYWRlZCBvbiBzY3JpcHRzIHBhbmVsIGNyZWF0aW9u L3Jlc2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODI2MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sOgorCiAyMDEyLTAzLTI5ICBD c2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBEaXZl cmdpbmcgdGVzdCByZXN1bHRzIG9uIDMyLzY0IGJpdCBhcmNoaXRlY3R1cmVzCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3Rl ZC50eHQKaW5kZXggYmYxYTBkM2UzZmVlMzQzNDNlNTliN2NiMzY5NzkxMWNhNTYwYTQ5YS4uM2I1 ZTBhODA0NmM0MjhhOTE4ODAwMWQ5OTkxYmI4YjUzMWE5ODA5ZSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4 dApAQCAtNiwxNiArNiwyOSBAQCBEdW1waW5nIFNjcmlwdHNOYXZpZ2F0b3IgJ1NjcmlwdHMnIHRh YjoKICAgYmFyLmpzCiAgIGJhei5qcwogICBmb28uanMKKyAgZm9vYmFyLmpzCiBEdW1waW5nIFNj cmlwdHNOYXZpZ2F0b3IgJ0NvbnRlbnQgc2NyaXB0cycgdGFiOgogU291cmNlIHJlcXVlc3RlZCBm b3IgYmF6LmpzCiAKIFJ1bm5pbmc6IHRlc3RJbml0aWFsTG9hZFdpdGhDb21ib0JveEZpbGVTZWxl Y3RvcgotU291cmNlIHJlcXVlc3RlZCBmb3IgZm9vLmpzCitTb3VyY2UgcmVxdWVzdGVkIGZvciBm b29iYXIuanMKIER1bXAgZmlsZXMgc2VsZWN0OgogICAgIGJhci5qcwogICAgIGJhei5qcwogICAg IGZvby5qcworICAgIGZvb2Jhci5qcworU291cmNlIHJlcXVlc3RlZCBmb3IgYmF6LmpzCisKK1J1 bm5pbmc6IHRlc3RSZXNldAogU291cmNlIHJlcXVlc3RlZCBmb3IgYmF6LmpzCitEdW1waW5nIFNj cmlwdHNOYXZpZ2F0b3IgJ1NjcmlwdHMnIHRhYjoKKyAgYmFyLmpzCisgIGJhei5qcworICBmb28u anMKK0R1bXBpbmcgU2NyaXB0c05hdmlnYXRvciAnQ29udGVudCBzY3JpcHRzJyB0YWI6CitEdW1w aW5nIFNjcmlwdHNOYXZpZ2F0b3IgJ1NjcmlwdHMnIHRhYjoKKyAgYmFyLmpzCitEdW1waW5nIFNj cmlwdHNOYXZpZ2F0b3IgJ0NvbnRlbnQgc2NyaXB0cycgdGFiOgogCiBSdW5uaW5nOiB0ZXN0U291 cmNlUmVwbGFjZWQKIER1bXBpbmcgU2NyaXB0c05hdmlnYXRvciAnU2NyaXB0cycgdGFiOgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRt bCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKaW5k ZXggZTU4Njg0ZTNkMGM4NTZiYWQ5NDlhYmJkMTI5OWZiYTE3MzIxNDQ4YS4uOWQ5MzlkMDM5MGY5 Yzc4M2NjNDA3Y2NhNDk0ZmFiMDkyZGE4OGJlMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sCkBAIC0xOSw2ICsxOSwyNiBAQCBmdW5j dGlvbiB0ZXN0KCkKICAgICAgICAgbW9kZWwuY2FuRWRpdFNjcmlwdFNvdXJjZSA9IGZ1bmN0aW9u KCkgeyByZXR1cm4gdHJ1ZTsgfTsKICAgICAgICAgdWlTb3VyY2VDb2RlcyA9IFtdOwogICAgICAg ICBtb2RlbC51aVNvdXJjZUNvZGVzID0gZnVuY3Rpb24oKSB7IHJldHVybiB1aVNvdXJjZUNvZGVz LnNsaWNlKCk7IH07CisgICAgICAgIG1vZGVsLl9hZGRVSVNvdXJjZUNvZGUgPSBmdW5jdGlvbih1 aVNvdXJjZUNvZGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIHVpU291cmNlQ29kZXMucHVzaCh1 aVNvdXJjZUNvZGUpOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlVJU291cmNlQ29k ZUFkZGVkLCB1aVNvdXJjZUNvZGUpOworICAgICAgICB9CisgICAgICAgIG1vZGVsLl9yZXNldCA9 IGZ1bmN0aW9uKHByZXNlcnZlZEl0ZW1zKQorICAgICAgICB7CisgICAgICAgICAgICB1aVNvdXJj ZUNvZGVzID0gcHJlc2VydmVkSXRlbXMgfHwgW107CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5F dmVudHMuRGVidWdnZXJSZXNldCwgbnVsbCk7CisgICAgICAgIH0KKyAgICAgICAgbW9kZWwuX3Jl cGxhY2VVSVNvdXJjZUNvZGVzID0gZnVuY3Rpb24ob2xkVUlTb3VyY2VDb2RlTGlzdCwgbmV3VUlT b3VyY2VDb2RlTGlzdCkKKyAgICAgICAgeworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBvbGRVSVNvdXJjZUNvZGVMaXN0Lmxlbmd0aDsgKytpKQorICAgICAgICAgICAgICB1aVNvdXJj ZUNvZGVzLnJlbW92ZShvbGRVSVNvdXJjZUNvZGVMaXN0W2ldKTsKKyAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgbmV3VUlTb3VyY2VDb2RlTGlzdC5sZW5ndGg7ICsraSkKKyAgICAgICAg ICAgICAgdWlTb3VyY2VDb2Rlcy5wdXNoKG5ld1VJU291cmNlQ29kZUxpc3RbaV0pOworICAgICAg ICAgICAgdmFyIGRhdGEgPSB7IG9sZFVJU291cmNlQ29kZUxpc3Q6IG9sZFVJU291cmNlQ29kZUxp c3QsIHVpU291cmNlQ29kZUxpc3Q6IG5ld1VJU291cmNlQ29kZUxpc3QgfTsKKyAgICAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLkV2ZW50cy5VSVNvdXJjZUNvZGVSZXBsYWNlZCwgZGF0YSk7CisgICAgICAg IH0KKwogICAgICAgICByZXR1cm4gbW9kZWw7CiAgICAgfQogICAgIGZ1bmN0aW9uIGNyZWF0ZVVJ U291Y2VDb2RlKHVybCkKQEAgLTM3LDE4ICs1NywyNCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAg ICAgZnVuY3Rpb24gdGVzdEluaXRpYWxMb2FkKG5leHQpCiAgICAgICAgIHsKICAgICAgICAgICAg IHZhciBtb2RlbCA9IGNyZWF0ZURlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWxNb2NrKCk7CisgICAg ICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gY3JlYXRlVUlTb3VjZUNvZGUoImZvb2Jhci5qcyIp OworICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZUZvbyA9IGNyZWF0ZVVJU291Y2VDb2RlKCJm b28uanMiKTsKKyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGVCYXIgPSBjcmVhdGVVSVNvdWNl Q29kZSgiYmFyLmpzIik7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlQmF6ID0gY3JlYXRl VUlTb3VjZUNvZGUoImJhei5qcyIpOworCisgICAgICAgICAgICBtb2RlbC5fYWRkVUlTb3VyY2VD b2RlKHVpU291cmNlQ29kZSk7CisKICAgICAgICAgICAgIHZhciBwYW5lbCA9IG5ldyBXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsKG1vZGVsKTsKICAgICAgICAgICAgIHBhbmVsLnNob3coKTsKIAot ICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZUJBWiA9IGNyZWF0ZVVJU291Y2VDb2RlKCJiYXou anMiKTsKLSAgICAgICAgICAgIHBhbmVsLl91aVNvdXJjZUNvZGVBZGRlZCh7IGRhdGE6IGNyZWF0 ZVVJU291Y2VDb2RlKCJmb28uanMiKSB9KTsKLSAgICAgICAgICAgIHBhbmVsLl91aVNvdXJjZUNv ZGVBZGRlZCh7IGRhdGE6IGNyZWF0ZVVJU291Y2VDb2RlKCJiYXIuanMiKSB9KTsKLSAgICAgICAg ICAgIHBhbmVsLl91aVNvdXJjZUNvZGVBZGRlZCh7IGRhdGE6IHVpU291cmNlQ29kZUJBWiB9KTsK KyAgICAgICAgICAgIG1vZGVsLl9hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlRm9vKTsKKyAg ICAgICAgICAgIG1vZGVsLl9hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlQmFyKTsKKyAgICAg ICAgICAgIG1vZGVsLl9hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlQmF6KTsKIAogICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wU2NyaXB0c05hdmlnYXRvcihwYW5lbC5fbmF2aWdhdG9y KTsKIAogICAgICAgICAgICAgLy8gU2VsZWN0ICJiYXouanMiLgotICAgICAgICAgICAgcGFuZWwu X3Nob3dGaWxlKHVpU291cmNlQ29kZUJBWik7CisgICAgICAgICAgICBwYW5lbC5fc2hvd0ZpbGUo dWlTb3VyY2VDb2RlQmF6KTsKICAgICAgICAgICAgIHBhbmVsLmRldGFjaCgpOwogCiAgICAgICAg ICAgICBuZXh0KCk7CkBAIC01NywxNCArODMsMjEgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg IGZ1bmN0aW9uIHRlc3RJbml0aWFsTG9hZFdpdGhDb21ib0JveEZpbGVTZWxlY3RvcihuZXh0KQog ICAgICAgICB7CiAgICAgICAgICAgICB2YXIgbW9kZWwgPSBjcmVhdGVEZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsTW9jaygpOworICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IGNyZWF0ZVVJ U291Y2VDb2RlKCJmb29iYXIuanMiKTsKKyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGVGb28g PSBjcmVhdGVVSVNvdWNlQ29kZSgiZm9vLmpzIik7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VD b2RlQmFyID0gY3JlYXRlVUlTb3VjZUNvZGUoImJhci5qcyIpOworICAgICAgICAgICAgdmFyIHVp U291cmNlQ29kZUJheiA9IGNyZWF0ZVVJU291Y2VDb2RlKCJiYXouanMiKTsKKworICAgICAgICAg ICAgbW9kZWwuX2FkZFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOworCiAgICAgICAgICAgICBX ZWJJbnNwZWN0b3Iuc2V0dGluZ3MudXNlU2NyaXB0c05hdmlnYXRvci5zZXQoZmFsc2UpOwogICAg ICAgICAgICAgdmFyIHBhbmVsID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwobW9kZWwp OwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnVzZVNjcmlwdHNOYXZpZ2F0b3Iu c2V0KHRydWUpOwogICAgICAgICAgICAgcGFuZWwuc2hvdygpOwogCi0gICAgICAgICAgICBwYW5l bC5fdWlTb3VyY2VDb2RlQWRkZWQoeyBkYXRhOiBjcmVhdGVVSVNvdWNlQ29kZSgiZm9vLmpzIikg fSk7Ci0gICAgICAgICAgICBwYW5lbC5fdWlTb3VyY2VDb2RlQWRkZWQoeyBkYXRhOiBjcmVhdGVV SVNvdWNlQ29kZSgiYmFyLmpzIikgfSk7Ci0gICAgICAgICAgICBwYW5lbC5fdWlTb3VyY2VDb2Rl QWRkZWQoeyBkYXRhOiBjcmVhdGVVSVNvdWNlQ29kZSgiYmF6LmpzIikgfSk7CisgICAgICAgICAg ICBtb2RlbC5fYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZUZvbyk7CisgICAgICAgICAgICBt b2RlbC5fYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZUJhcik7CisgICAgICAgICAgICBtb2Rl bC5fYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZUJheik7CiAKICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuYWRkUmVzdWx0KCJEdW1wIGZpbGVzIHNlbGVjdDoiKTsKICAgICAgICAgICAgIHZh ciBzZWxlY3QgPSBwYW5lbC5fZmlsZVNlbGVjdG9yLl9maWxlc1NlbGVjdEVsZW1lbnQ7CkBAIC03 Miw4ICsxMDUsOCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmFkZFJlc3VsdChzZWxlY3RbaV0udGV4dC5yZXBsYWNlKC9cdTAwYTAvZywgIiAiKSk7CiAK ICAgICAgICAgICAgIC8vIFNlbGVjdGVkIGZpbGUgc2hvdWxkIGJlICJmb28uanMiLgotICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoMiwgc2VsZWN0LnNlbGVjdGVkSW5kZXgp OwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImZvby5qcyIsIHNlbGVj dFsyXS50ZXh0LnJlcGxhY2UoL1xzL2csICIiKSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydEVxdWFscygzLCBzZWxlY3Quc2VsZWN0ZWRJbmRleCk7CisgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFzc2VydEVxdWFscygiZm9vYmFyLmpzIiwgc2VsZWN0WzNdLnRleHQucmVwbGFj ZSgvXHMvZywgIiIpKTsKIAogICAgICAgICAgICAgLy8gU2VsZWN0ICJiYXouanMiLgogICAgICAg ICAgICAgc2VsZWN0LnNlbGVjdGVkSW5kZXggPSAxOwpAQCAtODMsMjIgKzExNiw0NyBAQCBmdW5j dGlvbiB0ZXN0KCkKICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgfSwKIAorICAgICAgICBm dW5jdGlvbiB0ZXN0UmVzZXQobmV4dCkKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIG1vZGVs ID0gY3JlYXRlRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbE1vY2soKTsKKyAgICAgICAgICAgIHZh ciBwYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsKG1vZGVsKTsKKyAgICAgICAg ICAgIHBhbmVsLnNob3coKTsKKworICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZUZvbyA9IGNy ZWF0ZVVJU291Y2VDb2RlKCJmb28uanMiKTsKKyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGVC YXIgPSBjcmVhdGVVSVNvdWNlQ29kZSgiYmFyLmpzIik7CisgICAgICAgICAgICB2YXIgdWlTb3Vy Y2VDb2RlQmF6ID0gY3JlYXRlVUlTb3VjZUNvZGUoImJhei5qcyIpOworCisgICAgICAgICAgICBt b2RlbC5fYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZUZvbyk7CisgICAgICAgICAgICBtb2Rl bC5fYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZUJhcik7CisgICAgICAgICAgICBtb2RlbC5f YWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZUJheik7CisKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZHVtcFNjcmlwdHNOYXZpZ2F0b3IocGFuZWwuX25hdmlnYXRvcik7CisKKyAgICAgICAg ICAgIG1vZGVsLl9yZXNldChbdWlTb3VyY2VDb2RlQmFyXSk7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmR1bXBTY3JpcHRzTmF2aWdhdG9yKHBhbmVsLl9uYXZpZ2F0b3IpOworCisgICAgICAg ICAgICBwYW5lbC5kZXRhY2goKTsKKyAgICAgICAgICAgIG5leHQoKTsKKyAgICAgICAgfSwKKwor CiAgICAgICAgIGZ1bmN0aW9uIHRlc3RTb3VyY2VSZXBsYWNlZChuZXh0KQogICAgICAgICB7CiAg ICAgICAgICAgICB2YXIgbW9kZWwgPSBjcmVhdGVEZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsTW9j aygpOwogICAgICAgICAgICAgdmFyIHBhbmVsID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwobW9kZWwpOwogICAgICAgICAgICAgcGFuZWwuc2hvdygpOwogCi0gICAgICAgICAgICBwYW5l bC5fdWlTb3VyY2VDb2RlQWRkZWQoeyBkYXRhOiBjcmVhdGVVSVNvdWNlQ29kZSgiZm9vLmpzIikg fSk7CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlRm9vID0gY3JlYXRlVUlTb3VjZUNvZGUo ImZvby5qcyIpOworICAgICAgICAgICAgbW9kZWwuX2FkZFVJU291cmNlQ29kZSh1aVNvdXJjZUNv ZGVGb28pOwogICAgICAgICAgICAgdmFyIGNvbXBpbGVkU291cmNlQ29kZSA9IGNyZWF0ZVVJU291 Y2VDb2RlKCJjb21waWxlZC5qcyIpOwotICAgICAgICAgICAgcGFuZWwuX3VpU291cmNlQ29kZUFk ZGVkKHsgZGF0YTogY29tcGlsZWRTb3VyY2VDb2RlIH0pOworICAgICAgICAgICAgbW9kZWwuX2Fk ZFVJU291cmNlQ29kZShjb21waWxlZFNvdXJjZUNvZGUpOwogCiAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmR1bXBTY3JpcHRzTmF2aWdhdG9yKHBhbmVsLl9uYXZpZ2F0b3IpOwogCiAgICAgICAg ICAgICAvLyBQbHVnIGNvbXBpbGVyIHNvdXJjZSBtYXBwaW5nLgogICAgICAgICAgICAgdmFyIHNv dXJjZTFTb3VyY2VDb2RlID0gY3JlYXRlVUlTb3VjZUNvZGUoInNvdXJjZTEuanMiKTsKICAgICAg ICAgICAgIHZhciBzb3VyY2UyU291cmNlQ29kZSA9IGNyZWF0ZVVJU291Y2VDb2RlKCJzb3VyY2Uy LmpzIik7Ci0gICAgICAgICAgICBwYW5lbC5fdWlTb3VyY2VDb2RlUmVwbGFjZWQoeyBkYXRhOiB7 IG9sZFVJU291cmNlQ29kZUxpc3Q6IFtjb21waWxlZFNvdXJjZUNvZGVdLCB1aVNvdXJjZUNvZGVM aXN0OiBbc291cmNlMVNvdXJjZUNvZGUsIHNvdXJjZTJTb3VyY2VDb2RlXSB9fSk7CisgICAgICAg ICAgICBtb2RlbC5fcmVwbGFjZVVJU291cmNlQ29kZXMoW2NvbXBpbGVkU291cmNlQ29kZV0sIFtz b3VyY2UxU291cmNlQ29kZSwgc291cmNlMlNvdXJjZUNvZGVdKTsKIAogICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5kdW1wU2NyaXB0c05hdmlnYXRvcihwYW5lbC5fbmF2aWdhdG9yKTsKICAgICAg ICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1NjcmlwdFNvdXJjZU9uU2NyaXB0c1BhbmVsKHBhbmVs LCAic291cmNlMi5qcyIsIHN0ZXAyKTsKQEAgLTEwOSw3ICsxNjcsNyBAQCBmdW5jdGlvbiB0ZXN0 KCkKIAogICAgICAgICAgICAgZnVuY3Rpb24gc3RlcDMoKSB7CiAgICAgICAgICAgICAgICAgLy8g VW5wbHVnIGNvbXBpbGVyIHNvdXJjZSBtYXBwaW5nLgotICAgICAgICAgICAgICAgIHBhbmVsLl91 aVNvdXJjZUNvZGVSZXBsYWNlZCh7IGRhdGE6IHsgb2xkVUlTb3VyY2VDb2RlTGlzdDogW3NvdXJj ZTFTb3VyY2VDb2RlLCBzb3VyY2UyU291cmNlQ29kZV0sIHVpU291cmNlQ29kZUxpc3Q6IFtjb21w aWxlZFNvdXJjZUNvZGVdIH19KTsKKyAgICAgICAgICAgICAgICBtb2RlbC5fcmVwbGFjZVVJU291 cmNlQ29kZXMoW3NvdXJjZTFTb3VyY2VDb2RlLCBzb3VyY2UyU291cmNlQ29kZV0sIFtjb21waWxl ZFNvdXJjZUNvZGVdKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBTY3JpcHRz TmF2aWdhdG9yKHBhbmVsLl9uYXZpZ2F0b3IpOwogCiAgICAgICAgICAgICAgICAgcGFuZWwuZGV0 YWNoKCk7CkBAIC0xMjUsMTYgKzE4MywxNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5zZXR0aW5ncy51c2VTY3JpcHRzTmF2aWdhdG9yLnNldCh0cnVlKTsKICAg ICAgICAgICAgIHBhbmVsLnNob3coKTsKIAotICAgICAgICAgICAgcGFuZWwuX3VpU291cmNlQ29k ZUFkZGVkKHsgZGF0YTogY3JlYXRlVUlTb3VjZUNvZGUoImZvby5qcyIpIH0pOworICAgICAgICAg ICAgdmFyIHVpU291cmNlQ29kZUZvbyA9IGNyZWF0ZVVJU291Y2VDb2RlKCJmb28uanMiKTsKKyAg ICAgICAgICAgIG1vZGVsLl9hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2RlRm9vKTsKICAgICAg ICAgICAgIHZhciBjb21waWxlZFNvdXJjZUNvZGUgPSBjcmVhdGVVSVNvdWNlQ29kZSgiY29tcGls ZWQuanMiKTsKLSAgICAgICAgICAgIHBhbmVsLl91aVNvdXJjZUNvZGVBZGRlZCh7IGRhdGE6IGNv bXBpbGVkU291cmNlQ29kZSB9KTsKKyAgICAgICAgICAgIG1vZGVsLl9hZGRVSVNvdXJjZUNvZGUo Y29tcGlsZWRTb3VyY2VDb2RlKTsKIAogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wQ29t Ym9Cb3hGaWxlU2VsZWN0b3IocGFuZWwuX2ZpbGVTZWxlY3Rvcik7CiAKICAgICAgICAgICAgIC8v IFBsdWcgY29tcGlsZXIgc291cmNlIG1hcHBpbmcuCiAgICAgICAgICAgICB2YXIgc291cmNlMVNv dXJjZUNvZGUgPSBjcmVhdGVVSVNvdWNlQ29kZSgic291cmNlMS5qcyIpOwogICAgICAgICAgICAg dmFyIHNvdXJjZTJTb3VyY2VDb2RlID0gY3JlYXRlVUlTb3VjZUNvZGUoInNvdXJjZTIuanMiKTsK LSAgICAgICAgICAgIHBhbmVsLl91aVNvdXJjZUNvZGVSZXBsYWNlZCh7IGRhdGE6IHsgb2xkVUlT b3VyY2VDb2RlTGlzdDogW2NvbXBpbGVkU291cmNlQ29kZV0sIHVpU291cmNlQ29kZUxpc3Q6IFtz b3VyY2UxU291cmNlQ29kZSwgc291cmNlMlNvdXJjZUNvZGVdIH19KTsKKyAgICAgICAgICAgIG1v ZGVsLl9yZXBsYWNlVUlTb3VyY2VDb2RlcyhbY29tcGlsZWRTb3VyY2VDb2RlXSwgW3NvdXJjZTFT b3VyY2VDb2RlLCBzb3VyY2UyU291cmNlQ29kZV0pOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5kdW1wQ29tYm9Cb3hGaWxlU2VsZWN0b3IocGFuZWwuX2ZpbGVTZWxlY3Rvcik7CiAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LnNob3dTY3JpcHRTb3VyY2VPblNjcmlwdHNQYW5lbChwYW5lbCwg InNvdXJjZTIuanMiLCBzdGVwMik7CiAKQEAgLTE0NCw3ICsyMDMsNyBAQCBmdW5jdGlvbiB0ZXN0 KCkKIAogICAgICAgICAgICAgZnVuY3Rpb24gc3RlcDMoKSB7CiAgICAgICAgICAgICAgICAgLy8g VW5wbHVnIGNvbXBpbGVyIHNvdXJjZSBtYXBwaW5nLgotICAgICAgICAgICAgICAgIHBhbmVsLl91 aVNvdXJjZUNvZGVSZXBsYWNlZCh7IGRhdGE6IHsgb2xkVUlTb3VyY2VDb2RlTGlzdDogW3NvdXJj ZTFTb3VyY2VDb2RlLCBzb3VyY2UyU291cmNlQ29kZV0sIHVpU291cmNlQ29kZUxpc3Q6IFtjb21w aWxlZFNvdXJjZUNvZGVdIH19KTsKKyAgICAgICAgICAgICAgICBtb2RlbC5fcmVwbGFjZVVJU291 cmNlQ29kZXMoW3NvdXJjZTFTb3VyY2VDb2RlLCBzb3VyY2UyU291cmNlQ29kZV0sIFtjb21waWxl ZFNvdXJjZUNvZGVdKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBDb21ib0Jv eEZpbGVTZWxlY3RvcihwYW5lbC5fZmlsZVNlbGVjdG9yKTsKIAogICAgICAgICAgICAgICAgIHBh bmVsLmRldGFjaCgpOwo=