65321 2011-07-28 09:20:01 -0700 Web Inspector: group scripts by folder in the scripts selector. 2011-08-02 03:40:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 65525 0 pfeldman pfeldman apavlov bweinstein dglazkov joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 443515 0 pfeldman 2011-07-28 09:20:01 -0700 Patch to follow. 443521 1 102264 pfeldman 2011-07-28 09:51:39 -0700 Created attachment 102264 Patch 443745 2 102264 webkit.review.bot 2011-07-28 17:47:18 -0700 Comment on attachment 102264 Patch Attachment 102264 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9260467 New failing tests: inspector/debugger/scripts-sorting.html 444535 3 102264 yurys 2011-07-31 23:16:45 -0700 Comment on attachment 102264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102264&action=review Before landing the change please make sure the test passes on Chromium. > Source/WebCore/inspector/front-end/ScriptsPanel.js:268 > + option.nameForSorting = folderNameForSorting + "\t/\t" + names.displayName; // User Tab to make files stick to their folder. Please fix the misleading comment. 444564 4 pfeldman 2011-08-01 01:17:20 -0700 Committed r92105: <http://trac.webkit.org/changeset/92105> 102264 2011-07-28 09:51:39 -0700 2011-07-31 23:16:45 -0700 Patch bug-65321-20110728205137.patch text/plain 12237 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTE5MTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyN2ZkZTE3MjVjMmZjNjkzMWZiMDE2 Y2IwMDE1YWRmZTk5ZThkNWIxLi4zNWFmYzI1MzAzZjRlODNhYWY3NGNiY2U5MjJmYTQ5ZjdiMGQz NzY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMjggIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGdyb3VwIHNjcmlw dHMgYnkgZm9sZGVyIGluIHRoZSBzY3JpcHRzIHNlbGVjdG9yLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMjEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyLXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0RlYnVnZ2VyVGVzdCk6CisgICAgICAg ICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbDogQWRk ZWQuCisKIDIwMTEtMDctMjIgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtDYWlyb10gU3dpdGNoIGZyb20gQ29udGV4dFNoYWRvdyB0byBTaGFkb3dC bHVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVz dC5qcwppbmRleCAxMDVlZWExYmQ4YWY5N2I4ODc1Y2E3MmI5ZWZiY2VjMzEwOTBjOTc3Li5mZDA4 MjRmNmNhNzRkNGZjMzQ3ZjYwNGNmMDUxNjQ4MDEzNTAxOTM0IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCisrKyBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMKQEAgLTE1OSw3ICsxNTks NyBAQCBJbnNwZWN0b3JUZXN0LnNob3dTY3JpcHRTb3VyY2UgPSBmdW5jdGlvbihzY3JpcHROYW1l LCBjYWxsYmFjaykKIHsKICAgICB2YXIgZmlsZXNTZWxlY3QgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgic2NyaXB0cy1maWxlcyIpOwogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZmlsZXNTZWxl Y3QubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgaWYgKGZpbGVzU2VsZWN0W2ldLnRleHQgPT09IHNj cmlwdE5hbWUpIHsKKyAgICAgICAgaWYgKGZpbGVzU2VsZWN0W2ldLnNjcmlwdE5hbWVGb3JUZXN0 ID09PSBzY3JpcHROYW1lKSB7CiAgICAgICAgICAgICBmaWxlc1NlbGVjdC5zZWxlY3RlZEluZGV4 ID0gaTsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5fZmlsZXNTZWxl Y3RDaGFuZ2VkKCk7CiAgICAgICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBXZWJJbnNwZWN0b3Iu cGFuZWxzLnNjcmlwdHMudmlzaWJsZVZpZXc7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLmQ5MDg2Njk5MTI0M2IxYWQ5ZjMyYmFiOTM3MTNhZTc3NDdhZDQ3ZjAKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDIzIEBACitUZXN0cyBzY3JpcHRzIHNvcnRpbmcgaW4gdGhl IHNjcmlwdHMgcGFuZWwuCisKK0RlYnVnZ2VyIHdhcyBlbmFibGVkLgorICAgICpOb24qVVJMKnBh dGgKKyAgICBibG9jay5qcz9ibG9jaz1mb28KKyAgICBnYS5qcworICAgIGxlbnRhLmJhbj9wZz00 ODgzJmlmcj0xCisgICAgbGVudGEuYmFuP3BnPTUzMDkmaWZyPTEKKyAgICB0b3AxMDAuamNuPzgw Njc0CisvX2pzL3Byb2R1Y3Rpb24KKyAgICBtb3Rvci5qcz8xMzA4OTI3NDMyCisvaQorICAgIHhn ZW1pdXMuanMKKy9pL2pzCisgICAganF1ZXJ5LTEuNS4xLm1pbi5qcworICAgIGpxdWVyeS5jb29r aWUuanMKK+KApmNhbC9nb29nbGUvY29kZS9jaHJvbWl1bS9zcmMvdGhpcmRfcGFydHkvV2ViS2l0 L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yCisgICAgZGVidWdnZXItdGVzdC5qcwor ICAgIGluc3BlY3Rvci10ZXN0LmpzCivigKZsb2NhbC9nb29nbGUvY29kZS9jaHJvbWl1bS9zcmMv dGhpcmRfcGFydHkvV2ViS2l0L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlcgorICAgIHNj cmlwdHMtc29ydGluZy5odG1sCitEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5iY2IwNTkxNTJhMmIxMmY4YjhkZDk4YzJkNGM1YTBhYTg4YjlmMmY3Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy5o dG1sCkBAIC0wLDAgKzEsNDggQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4v aHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlw dCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMiPjwvc2Ny aXB0PgorCis8c2NyaXB0PgordmFyIHNjcmlwdHMgPSBbCisgICAgImJsb2NrLmpzP2Jsb2NrPWZv byIsCisgICAgImdhLmpzIiwKKyAgICAibGVudGEuYmFuP3BnPTQ4ODMmaWZyPTEiLAorICAgICJs ZW50YS5iYW4/cGc9NTMwOSZpZnI9MSIsCisgICAgInRvcDEwMC5qY24/ODA2NzQiLAorICAgICJf anMvcHJvZHVjdGlvbi9tb3Rvci5qcz8xMzA4OTI3NDMyIiwKKyAgICAiaS94Z2VtaXVzLmpzIiwK KyAgICAiaS9qcy9qcXVlcnktMS41LjEubWluLmpzIiwKKyAgICAiaS9qcy9qcXVlcnkuY29va2ll LmpzIiBdOworCitmb3IgKHZhciBpID0gMDsgaSA8IHNjcmlwdHMubGVuZ3RoOyArK2kpCisgICAg d2luZG93LmV2YWwoImZ1bmN0aW9uIGZ1bmMiICsgaSArICIoKSB7fSAvL0Agc291cmNlVVJMPWh0 dHA6Ly9mb28uY29tLyIgKyBzY3JpcHRzW2ldKTsKKword2luZG93LmV2YWwoImZ1bmN0aW9uIGZ1 bmNOb25VUkwoKSB7fSAvL0Agc291cmNlVVJMPSpOb24qVVJMKnBhdGgiKTsKKworPC9zY3JpcHQ+ CisKKzxzY3JpcHQ+CitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICB2YXIgc2NyaXB0cyA9IFtdOwor ICAgIEluc3BlY3RvclRlc3Quc3RhcnREZWJ1Z2dlclRlc3Qoc3RlcDEpOworCisgICAgZnVuY3Rp b24gc3RlcDEoKQorICAgIHsKKyAgICAgICAgdmFyIHNlbGVjdCA9IFdlYkluc3BlY3Rvci5wYW5l bHMuc2NyaXB0cy5fZmlsZXNTZWxlY3RFbGVtZW50OworICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IHNlbGVjdC5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KHNlbGVjdFtpXS50ZXh0Q29udGVudC5yZXBsYWNlKC9cdTAwYTAvZywgIiAiKSk7CisgICAg ICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVEZWJ1Z2dlclRlc3QoKTsKKyAgICB9Cit9Cis8L3Nj cmlwdD4KKworPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorPHA+CitUZXN0cyBz Y3JpcHRzIHNvcnRpbmcgaW4gdGhlIHNjcmlwdHMgcGFuZWwuCis8L3A+Cis8L2JvZHk+CisKKzwv aHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA4MDJmY2U5Y2U2ZWViMTVjMGM1ZjUxZDk1MjU1MmFhODhhNDQy NjFjLi4xMDY3ZjQzZTdjYzRmZjVlMDU3ZDU5NzMxZGYyOTI4M2UxMmUwODE3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMjggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBn b29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGdyb3VwIHNjcmlwdHMgYnkgZm9s ZGVyIGluIHRoZSBzY3JpcHRzIHNlbGVjdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0 aW5nLmh0bWwKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3NvdXJjZUZp bGVBZGRlZC5nZXQgaWYpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUuX2FkZE9wdGlvblRvRmlsZXNTZWxlY3QuaW5zZXJ0T3JkZXJlZC5vcHRpb25Db21wYXJl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9hZGRPcHRp b25Ub0ZpbGVzU2VsZWN0Lmluc2VydE9yZGVyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5wcm90b3R5cGUuX2FkZE9wdGlvblRvRmlsZXNTZWxlY3QpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2ZvbGRlckFuZERpc3BsYXlOYW1l Rm9yU2NyaXB0VVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9y U2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zdWdnZXN0ZWRGaWxlTmFtZSk6CisKIDIwMTEtMDctMjIg IE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDYWly b10gU3dpdGNoIGZyb20gQ29udGV4dFNoYWRvdyB0byBTaGFkb3dCbHVyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDJiOWRh YzliNjc4NTc2YWI4MmI2YWExYzI5ZDQzNjk1Mjg1YjEzYTYuLmQyZmU1NmQxMzgxM2U2ZDllNTJl NzVhYzFmNDc5MTJjZTg2Nzk0NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0yNDAsNyArMjQwLDggQEAgV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2FkZE9wdGlvblRv RmlsZXNTZWxlY3Qoc291cmNlRmlsZSk7CiAKICAgICAgICAgdmFyIGxhc3RWaWV3ZWRVUkwgPSBX ZWJJbnNwZWN0b3Iuc2V0dGluZ3MubGFzdFZpZXdlZFNjcmlwdEZpbGUuZ2V0KCk7Ci0gICAgICAg IGlmICh0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQubGVuZ3RoID09PSAxKSB7CisgICAgICAgIGlm ICghdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50LmluaXRpYWxTZWxlY3Rpb25Qcm9jZXNzZWQpIHsK KyAgICAgICAgICAgIHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5pbml0aWFsU2VsZWN0aW9uUHJv Y2Vzc2VkID0gdHJ1ZTsKICAgICAgICAgICAgIC8vIE9wdGlvbiB3ZSBqdXN0IGFkZGVkIGlzIHRo ZSBvbmx5IG9wdGlvbiBpbiBmaWxlcyBzZWxlY3QuCiAgICAgICAgICAgICAvLyBXZSBoYXZlIHRv IHNob3cgY29ycmVzcG9uZGluZyBzb3VyY2UgZnJhbWUgaW1tZWRpYXRlbHkuCiAgICAgICAgICAg ICB0aGlzLl9zaG93U291cmNlRnJhbWVBbmRBZGRUb0hpc3Rvcnkoc291cmNlRmlsZS5pZCk7CkBA IC0yNTQsNTkgKzI1NSw3NyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9 IHsKICAgICBfYWRkT3B0aW9uVG9GaWxlc1NlbGVjdDogZnVuY3Rpb24oc291cmNlRmlsZSkKICAg ICB7CiAgICAgICAgIHZhciBzZWxlY3QgPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQ7CisgICAg ICAgIGlmICghc2VsZWN0LmZvbGRlck9wdGlvbnMpCisgICAgICAgICAgICBzZWxlY3QuZm9sZGVy T3B0aW9ucyA9IHt9OworCiAgICAgICAgIHZhciBvcHRpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJvcHRpb24iKTsKLSAgICAgICAgb3B0aW9uLnRleHQgPSB0aGlzLl9kaXNwbGF5TmFtZUZv clNjcmlwdFVSTChzb3VyY2VGaWxlLnVybCkgfHwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJv Z3JhbSkiKTsKKyAgICAgICAgdmFyIHBhcnNlZFVSTCA9IHNvdXJjZUZpbGUudXJsLmFzUGFyc2Vk VVJMKCk7CisKKyAgICAgICAgdmFyIG5hbWVzID0gdGhpcy5fZm9sZGVyQW5kRGlzcGxheU5hbWVG b3JTY3JpcHRVUkwoc291cmNlRmlsZS51cmwpOworICAgICAgICBvcHRpb24udGV4dCA9IG5hbWVz LmRpc3BsYXlOYW1lID8gIlx1MDBhMFx1MDBhMFx1MDBhMFx1MDBhMCIgKyBuYW1lcy5kaXNwbGF5 TmFtZSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7CisgICAgICAgIG9wdGlv bi5zY3JpcHROYW1lRm9yVGVzdCA9IG5hbWVzLmRpc3BsYXlOYW1lOworICAgICAgICB2YXIgZm9s ZGVyTmFtZUZvclNvcnRpbmcgPSAoc291cmNlRmlsZS5pc0NvbnRlbnRTY3JpcHQgPyAiMiIgOiAi MCIpICsgbmFtZXMuZm9sZGVyTmFtZTsKKyAgICAgICAgb3B0aW9uLm5hbWVGb3JTb3J0aW5nID0g Zm9sZGVyTmFtZUZvclNvcnRpbmcgKyAiXHQvXHQiICsgbmFtZXMuZGlzcGxheU5hbWU7IC8vIFVz ZXIgVGFiIHRvIG1ha2UgZmlsZXMgc3RpY2sgdG8gdGhlaXIgZm9sZGVyLgogICAgICAgICBvcHRp b24udGl0bGUgPSBzb3VyY2VGaWxlLnVybDsKLSAgICAgICAgb3B0aW9uLmlzQ29udGVudFNjcmlw dCA9IHNvdXJjZUZpbGUuaXNDb250ZW50U2NyaXB0OwogICAgICAgICBpZiAoc291cmNlRmlsZS5p c0NvbnRlbnRTY3JpcHQpCiAgICAgICAgICAgICBvcHRpb24uYWRkU3R5bGVDbGFzcygiZXh0ZW5z aW9uLXNjcmlwdCIpOwotICAgICAgICBmdW5jdGlvbiBjb21wYXJlKGEsIGIpCi0gICAgICAgIHsK LSAgICAgICAgICAgIHJldHVybiBhIDwgYiA/IC0xIDogKGEgPiBiID8gMSA6IDApOwotICAgICAg ICB9Ci0gICAgICAgIGZ1bmN0aW9uIG9wdGlvbkNvbXBhcmUoYSwgYikKLSAgICAgICAgewotICAg ICAgICAgICAgaWYgKGEgPT09IHNlbGVjdC5jb250ZW50U2NyaXB0U2VjdGlvbikKLSAgICAgICAg ICAgICAgICByZXR1cm4gYi5pc0NvbnRlbnRTY3JpcHQgPyAtMSA6IDE7Ci0gICAgICAgICAgICBp ZiAoYiA9PT0gc2VsZWN0LmNvbnRlbnRTY3JpcHRTZWN0aW9uKQotICAgICAgICAgICAgICAgIHJl dHVybiBhLmlzQ29udGVudFNjcmlwdCA/IDEgOiAtMTsKIAotICAgICAgICAgICAgaWYgKGEuaXND b250ZW50U2NyaXB0ICYmICFiLmlzQ29udGVudFNjcmlwdCkKLSAgICAgICAgICAgICAgICByZXR1 cm4gMTsKLSAgICAgICAgICAgIGlmICghYS5pc0NvbnRlbnRTY3JpcHQgJiYgYi5pc0NvbnRlbnRT Y3JpcHQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIC0xOwotCi0gICAgICAgICAgICByZXR1cm4g Y29tcGFyZShhLnRleHQsIGIudGV4dCkgfHwgY29tcGFyZShhLnRpdGxlLCBiLnRpdGxlKTsKKyAg ICAgICAgZnVuY3Rpb24gaW5zZXJ0T3JkZXJlZChvcHRpb24pCisgICAgICAgIHsKKyAgICAgICAg ICAgIGZ1bmN0aW9uIG9wdGlvbkNvbXBhcmUoYSwgYikKKyAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICByZXR1cm4gYS5uYW1lRm9yU29ydGluZy5sb2NhbGVDb21wYXJlKGIubmFtZUZvclNv cnRpbmcpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIGluc2VydGlvbkluZGV4ID0g aW5zZXJ0aW9uSW5kZXhGb3JPYmplY3RJbkxpc3RTb3J0ZWRCeUZ1bmN0aW9uKG9wdGlvbiwgc2Vs ZWN0LmNoaWxkTm9kZXMsIG9wdGlvbkNvbXBhcmUpOworICAgICAgICAgICAgc2VsZWN0Lmluc2Vy dEJlZm9yZShvcHRpb24sIGluc2VydGlvbkluZGV4IDwgMCA/IG51bGwgOiBzZWxlY3QuY2hpbGRO b2Rlcy5pdGVtKGluc2VydGlvbkluZGV4KSk7CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgaW5z ZXJ0aW9uSW5kZXggPSBpbnNlcnRpb25JbmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rp b24ob3B0aW9uLCBzZWxlY3QuY2hpbGROb2Rlcywgb3B0aW9uQ29tcGFyZSk7Ci0gICAgICAgIHNl bGVjdC5pbnNlcnRCZWZvcmUob3B0aW9uLCBpbnNlcnRpb25JbmRleCA8IDAgPyBudWxsIDogc2Vs ZWN0LmNoaWxkTm9kZXMuaXRlbShpbnNlcnRpb25JbmRleCkpOworICAgICAgICBpbnNlcnRPcmRl cmVkKG9wdGlvbik7CiAKICAgICAgICAgaWYgKHNvdXJjZUZpbGUuaXNDb250ZW50U2NyaXB0ICYm ICFzZWxlY3QuY29udGVudFNjcmlwdFNlY3Rpb24pIHsKICAgICAgICAgICAgIHZhciBjb250ZW50 U2NyaXB0U2VjdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIpOwogICAgICAg ICAgICAgY29udGVudFNjcmlwdFNlY3Rpb24udGV4dCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi Q29udGVudCBzY3JpcHRzIik7CiAgICAgICAgICAgICBjb250ZW50U2NyaXB0U2VjdGlvbi5kaXNh YmxlZCA9IHRydWU7CisgICAgICAgICAgICBvcHRpb24ubmFtZUZvclNvcnRpbmcgPSAiMS9Db250 ZW50U2NyaXB0U2VwYXJhdG9yIjsKICAgICAgICAgICAgIHNlbGVjdC5jb250ZW50U2NyaXB0U2Vj dGlvbiA9IGNvbnRlbnRTY3JpcHRTZWN0aW9uOworICAgICAgICAgICAgaW5zZXJ0T3JkZXJlZChj b250ZW50U2NyaXB0U2VjdGlvbik7CisgICAgICAgIH0KIAotICAgICAgICAgICAgdmFyIGluc2Vy dGlvbkluZGV4ID0gaW5zZXJ0aW9uSW5kZXhGb3JPYmplY3RJbkxpc3RTb3J0ZWRCeUZ1bmN0aW9u KGNvbnRlbnRTY3JpcHRTZWN0aW9uLCBzZWxlY3QuY2hpbGROb2Rlcywgb3B0aW9uQ29tcGFyZSk7 Ci0gICAgICAgICAgICBzZWxlY3QuaW5zZXJ0QmVmb3JlKGNvbnRlbnRTY3JpcHRTZWN0aW9uLCBp bnNlcnRpb25JbmRleCA8IDAgPyBudWxsIDogc2VsZWN0LmNoaWxkTm9kZXMuaXRlbShpbnNlcnRp b25JbmRleCkpOworICAgICAgICBpZiAobmFtZXMuZm9sZGVyTmFtZSAmJiAhc2VsZWN0LmZvbGRl ck9wdGlvbnNbbmFtZXMuZm9sZGVyTmFtZV0pIHsKKyAgICAgICAgICAgIHZhciBmb2xkZXJPcHRp b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKTsKKyAgICAgICAgICAgIGZvbGRl ck9wdGlvbi50ZXh0ID0gbmFtZXMuZm9sZGVyTmFtZTsKKyAgICAgICAgICAgIGZvbGRlck9wdGlv bi5uYW1lRm9yU29ydGluZyA9IGZvbGRlck5hbWVGb3JTb3J0aW5nOworICAgICAgICAgICAgZm9s ZGVyT3B0aW9uLmRpc2FibGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHNlbGVjdC5mb2xkZXJPcHRp b25zW25hbWVzLmZvbGRlck5hbWVdID0gZm9sZGVyT3B0aW9uOworICAgICAgICAgICAgaW5zZXJ0 T3JkZXJlZChmb2xkZXJPcHRpb24pOwogICAgICAgICB9CisKICAgICAgICAgb3B0aW9uLl9zb3Vy Y2VGaWxlSWQgPSBzb3VyY2VGaWxlLmlkOwogICAgICAgICB0aGlzLl9zb3VyY2VGaWxlSWRUb0Zp bGVzU2VsZWN0T3B0aW9uW3NvdXJjZUZpbGUuaWRdID0gb3B0aW9uOwogICAgIH0sCiAKLSAgICBf ZGlzcGxheU5hbWVGb3JTY3JpcHRVUkw6IGZ1bmN0aW9uKHVybCkKKyAgICBfZm9sZGVyQW5kRGlz cGxheU5hbWVGb3JTY3JpcHRVUkw6IGZ1bmN0aW9uKHVybCkKICAgICB7CisgICAgICAgIHZhciBw YXJzZWRVUkwgPSB1cmwuYXNQYXJzZWRVUkwoKTsKKyAgICAgICAgaWYgKHBhcnNlZFVSTCkKKyAg ICAgICAgICAgIHVybCA9IHBhcnNlZFVSTC5wYXRoOworCisgICAgICAgIHZhciBmb2xkZXJOYW1l ID0gIiI7CiAgICAgICAgIHZhciBkaXNwbGF5TmFtZSA9IHVybDsKLSAgICAgICAgdmFyIGluZGV4 T2ZRdWVyeSA9IGRpc3BsYXlOYW1lLmluZGV4T2YoIj8iKTsKLSAgICAgICAgaWYgKGluZGV4T2ZR dWVyeSA+IDApCi0gICAgICAgICAgICBkaXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lLnN1YnN0cmlu ZygwLCBpbmRleE9mUXVlcnkpOworCiAgICAgICAgIHZhciBmcm9tSW5kZXggPSBkaXNwbGF5TmFt ZS5sYXN0SW5kZXhPZigiLyIsIGRpc3BsYXlOYW1lLmxlbmd0aCAtIDIpOwotICAgICAgICBpZiAo ZnJvbUluZGV4ICE9PSAtMSkKKyAgICAgICAgaWYgKGZyb21JbmRleCAhPT0gLTEpIHsKKyAgICAg ICAgICAgIGZvbGRlck5hbWUgPSBkaXNwbGF5TmFtZS5zdWJzdHJpbmcoMCwgZnJvbUluZGV4KTsK ICAgICAgICAgICAgIGRpc3BsYXlOYW1lID0gZGlzcGxheU5hbWUuc3Vic3RyaW5nKGZyb21JbmRl eCArIDEpOwotICAgICAgICBpZiAoZGlzcGxheU5hbWUubGVuZ3RoID4gMTAwKQotICAgICAgICAg ICAgZGlzcGxheU5hbWUgPSBkaXNwbGF5TmFtZS5zdWJzdHJpbmcoMCwgODApICsgIi4uLiI7Ci0g ICAgICAgIHJldHVybiBkaXNwbGF5TmFtZTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChkaXNw bGF5TmFtZS5sZW5ndGggPiA4MCkKKyAgICAgICAgICAgIGRpc3BsYXlOYW1lID0gIlx1MjAyNiIg KyBkaXNwbGF5TmFtZS5zdWJzdHJpbmcoZGlzcGxheU5hbWUubGVuZ3RoIC0gODApOworCisgICAg ICAgIGlmIChmb2xkZXJOYW1lLmxlbmd0aCA+IDgwKQorICAgICAgICAgICAgZm9sZGVyTmFtZSA9 ICJcdTIwMjYiICsgZm9sZGVyTmFtZS5zdWJzdHJpbmcoZm9sZGVyTmFtZS5sZW5ndGggLSA4MCk7 CisgCisgICAgICAgIHJldHVybiB7IGZvbGRlck5hbWU6IGZvbGRlck5hbWUsIGRpc3BsYXlOYW1l OiBkaXNwbGF5TmFtZX07CiAgICAgfSwKIAogICAgIHNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0 ZWQ6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCwgaW5FZGl0TW9kZSkKQEAgLTQ5NSw2ICs1MTQsMTEg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu X3NvdXJjZUZpbGVJZFRvU291cmNlRnJhbWUgPSB7fTsKICAgICAgICAgdGhpcy5fc291cmNlRmls ZUlkVG9GaWxlc1NlbGVjdE9wdGlvbiA9IHt9OwogICAgICAgICB0aGlzLl9maWxlc1NlbGVjdEVs ZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50 LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgIHRoaXMuX2ZpbGVzU2VsZWN0RWxlbWVudC5mb2xk ZXJPcHRpb25zID0ge307CisgICAgICAgIGRlbGV0ZSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQu aW5pdGlhbFNlbGVjdGlvblByb2Nlc3NlZDsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2ZpbGVzU2Vs ZWN0RWxlbWVudC5jb250ZW50U2NyaXB0U2VjdGlvbjsKKwogICAgICAgICB0aGlzLmZ1bmN0aW9u c1NlbGVjdEVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy52aWV3c0NvbnRh aW5lckVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKIApAQCAtMTE4MSw3ICsxMjA1LDggQEAgV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlID0g ewogICAgIHN1Z2dlc3RlZEZpbGVOYW1lOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIg c291cmNlRmlsZSA9IHRoaXMuX21vZGVsLnNvdXJjZUZpbGUodGhpcy5fc291cmNlRmlsZUlkKTsK LSAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5fZGlzcGxheU5hbWVG b3JTY3JpcHRVUkwoc291cmNlRmlsZS51cmwpIHx8ICJ1bnRpdGxlZC5qcyI7CisgICAgICAgIHZh ciBuYW1lcyA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5fZm9sZGVyQW5kRGlzcGxheU5h bWVGb3JTY3JpcHRVUkwoc291cmNlRmlsZS51cmwpOworICAgICAgICByZXR1cm4gbmFtZXMuZGlz cGxheU5hbWUgfHwgInVudGl0bGVkLmpzIjsKICAgICB9CiB9CiAK