35392 2010-02-25 09:41:14 -0800 Web Inspector: make script lines count calculation lazy. 2010-02-25 09:57:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 193772 0 pfeldman 2010-02-25 09:41:14 -0800 This speeds things up and make chromium ready to the change. 193774 1 49499 pfeldman 2010-02-25 09:44:10 -0800 Created attachment 49499 [PATCH] Proposed change. 193777 2 49499 dglazkov 2010-02-25 09:49:28 -0800 Comment on attachment 49499 [PATCH] Proposed change. Looks sane. 193780 3 pfeldman 2010-02-25 09:57:26 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/Script.js M WebCore/inspector/front-end/ScriptsPanel.js M WebCore/inspector/front-end/SourceView.js M WebKit/chromium/ChangeLog M WebKit/chromium/src/js/Tests.js Committed r55241 49499 2010-02-25 09:44:10 -0800 2010-02-25 09:49:28 -0800 [PATCH] Proposed change. lines_count text/plain 10187 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YThlODI1MC4uZGFmYWU0YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMi0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtYWtlIHNjcmlwdCBsaW5lcyBjb3Vu dCBjYWxjdWxhdGlvbiBsYXp5LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNTM5MgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TY3JpcHQucHJvdG90eXBlLmdldCBsaW5lc0NvdW50KToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90 b3R5cGUuX2FkZEJyZWFrcG9pbnQpOgorCiAyMDEwLTAyLTI1ICBYYW4gTG9wZXogIDx4bG9wZXpA aWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwppbmRleCA1ODI2OGQ5Li45YmU2MjRhIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKQEAgLTMyLDEzICszMiw2IEBAIFdlYklu c3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBzb3VyY2UsIHN0 YXJ0aW5nTGluZSwgZXJyb3JMCiAgICAgdGhpcy5lcnJvckxpbmUgPSBlcnJvckxpbmU7CiAgICAg dGhpcy5lcnJvck1lc3NhZ2UgPSBlcnJvck1lc3NhZ2U7CiAKLSAgICB0aGlzLmxpbmVzQ291bnQg PSAwOwotICAgIHZhciBsYXN0SW5kZXggPSBzb3VyY2UuaW5kZXhPZigiXG4iKTsKLSAgICB3aGls ZSAobGFzdEluZGV4ICE9PSAtMSkgewotICAgICAgICBsYXN0SW5kZXggPSBzb3VyY2UuaW5kZXhP ZigiXG4iLCBsYXN0SW5kZXggKyAxKSAKLSAgICAgICAgdGhpcy5saW5lc0NvdW50Kys7Ci0gICAg fQotCiAgICAgLy8gaWYgbm8gVVJMLCBsb29rIGZvciAiLy9AIHNvdXJjZVVSTD0iIGRlY29yYXRv cgogICAgIC8vIG5vdGUgdGhhdCB0aGlzIHNvdXJjZVVSTCBjb21tZW50IGRlY29yYXRvciBpcyBi ZWhhdmlvciB0aGF0IEZpcmVCdWcgYWRkZWQKICAgICAvLyBpbiBpdCdzIDEuMSByZWxlYXNlIGFz IG5vdGVkIGluIHRoZSByZWxlYXNlIG5vdGVzOgpAQCAtNTQsNCArNDcsMTUgQEAgV2ViSW5zcGVj dG9yLlNjcmlwdCA9IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIHNvdXJjZSwgc3RhcnRp bmdMaW5lLCBlcnJvckwKIH0KIAogV2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7Cisg ICAgZ2V0IGxpbmVzQ291bnQoKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLnNvdXJjZSkKKyAg ICAgICAgICAgIHJldHVybiAwOworICAgICAgICB0aGlzLl9saW5lc0NvdW50ID0gMDsKKyAgICAg ICAgdmFyIGxhc3RJbmRleCA9IHRoaXMuc291cmNlLmluZGV4T2YoIlxuIik7CisgICAgICAgIHdo aWxlIChsYXN0SW5kZXggIT09IC0xKSB7CisgICAgICAgICAgICBsYXN0SW5kZXggPSB0aGlzLnNv dXJjZS5pbmRleE9mKCJcbiIsIGxhc3RJbmRleCArIDEpCisgICAgICAgICAgICB0aGlzLl9saW5l c0NvdW50Kys7CisgICAgICAgIH0KKyAgICB9CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCAxZWY3MDlkLi5lMjMzNmVlIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTY3Nyw3ICs2NzcsNyBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgb3B0aW9uLnJl cHJlc2VudGVkT2JqZWN0ID0gc2NyaXB0LnJlc291cmNlIHx8IHNjcmlwdDsKICAgICAgICAgb3B0 aW9uLnVybCA9IGRpc3BsYXlOYW1lOwogICAgICAgICBvcHRpb24uc3RhcnRpbmdMaW5lID0gc2Ny aXB0LnN0YXJ0aW5nTGluZTsKLSAgICAgICAgb3B0aW9uLnRleHQgPSBzY3JpcHQucmVzb3VyY2Ug PyBkaXNwbGF5TmFtZSA6IFN0cmluZy5zcHJpbnRmKCIlcyAoJWQgLSAlZCkiLCBkaXNwbGF5TmFt ZSwgc2NyaXB0LnN0YXJ0aW5nTGluZSwgc2NyaXB0LnN0YXJ0aW5nTGluZSArIHNjcmlwdC5saW5l c0NvdW50KTsKKyAgICAgICAgb3B0aW9uLnRleHQgPSBzY3JpcHQucmVzb3VyY2UgPyBkaXNwbGF5 TmFtZSA6IFN0cmluZy5zcHJpbnRmKCIlczolZCIsIGRpc3BsYXlOYW1lLCBzY3JpcHQuc3RhcnRp bmdMaW5lKTsKIAogICAgICAgICBmdW5jdGlvbiBvcHRpb25Db21wYXJlKGEsIGIpCiAgICAgICAg IHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3Lmpz IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKaW5kZXggMzgyZDg0 MC4uYjQwMWMxMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMK QEAgLTkyLDEyICs5MiwxMyBAQCBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgX2FkZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmUpCiAgICAgewogICAgICAgICB2YXIg c291cmNlSUQgPSBudWxsOworICAgICAgICB2YXIgY2xvc2VzdFN0YXJ0aW5nTGluZSA9IDA7CiAg ICAgICAgIHZhciBzY3JpcHRzID0gdGhpcy5yZXNvdXJjZS5zY3JpcHRzOwogICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHNjcmlwdHMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBz Y3JpcHQgPSBzY3JpcHRzW2ldOwotICAgICAgICAgICAgaWYgKHNjcmlwdC5zdGFydGluZ0xpbmUg PD0gbGluZSAmJiBzY3JpcHQuc3RhcnRpbmdMaW5lICsgc2NyaXB0LmxpbmVzQ291bnQgPiBsaW5l KSB7CisgICAgICAgICAgICBpZiAoc2NyaXB0LnN0YXJ0aW5nTGluZSA8PSBsaW5lICYmIHNjcmlw dC5zdGFydGluZ0xpbmUgPj0gY2xvc2VzdFN0YXJ0aW5nTGluZSkgeworICAgICAgICAgICAgICAg IGNsb3Nlc3RTdGFydGluZ0xpbmUgPSBzY3JpcHQuc3RhcnRpbmdMaW5lOwogICAgICAgICAgICAg ICAgIHNvdXJjZUlEID0gc2NyaXB0LnNvdXJjZUlEOwotICAgICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICAgICAgfQogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGI5MjM3MmEuLjhmNGZl ZmUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEwLTAyLTI1ICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2Ugc2NyaXB0IGxpbmVzIGNv dW50IGNhbGN1bGF0aW9uIGxhenkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM1MzkyCisKKyAgICAgICAgKiBzcmMvanMvVGVzdHMuanM6CisgICAg ICAgICguVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0U2NyaXB0c1RhYklzUG9wdWxhdGVkT25JbnNw ZWN0ZWRQYWdlUmVmcmVzaC53YWl0VW50aWxTY3JpcHRJc1BhcnNlZCk6CisgICAgICAgICguVGVz dFN1aXRlLnByb3RvdHlwZS50ZXN0U2NyaXB0c1RhYklzUG9wdWxhdGVkT25JbnNwZWN0ZWRQYWdl UmVmcmVzaC5jaGVja1NjcmlwdHNQYW5lbCk6CisgICAgICAgICguVGVzdFN1aXRlLnByb3RvdHlw ZS50ZXN0U2NyaXB0c1RhYklzUG9wdWxhdGVkT25JbnNwZWN0ZWRQYWdlUmVmcmVzaCk6CisgICAg ICAgICguVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0Tm9TY3JpcHREdXBsaWNhdGVzT25QYW5lbFN3 aXRjaC5jaGVja1NjcmlwdHNQYW5lbCk6CisgICAgICAgICguVGVzdFN1aXRlLnByb3RvdHlwZS50 ZXN0QXV0b0NvbnRpbnVlT25TeW50YXhFcnJvci5jaGVja1NjcmlwdHNMaXN0KToKKyAgICAgICAg KC5UZXN0U3VpdGUucHJvdG90eXBlLl9leGVjdXRlRnVuY3Rpb25Gb3JTdGVwVGVzdCk6CisKIDIw MTAtMDItMjQgIEpheSBDYW1wYW4gIDxqY2FtcGFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pz L1Rlc3RzLmpzIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9UZXN0cy5qcwppbmRleCBmYTBjOTlm Li5jZTFlY2JmIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL1Rlc3RzLmpzCisr KyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvVGVzdHMuanMKQEAgLTI5NSw3ICsyOTUsNyBAQCBU ZXN0U3VpdGUucHJvdG90eXBlLnRlc3RSZXNvdXJjZUNvbnRlbnRMZW5ndGggPSBmdW5jdGlvbigp CiAgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VzW2lkZW50 aWZpZXJdOwogICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSB8fCAhcmVzb3VyY2UudXJsKQogICAg ICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGlmIChyZXNvdXJjZS51cmwuc2VhcmNo KCJpbWFnZS5odG1sJCIpICE9PSAtMSkgeworICAgICAgICAgICAgaWYgKHJlc291cmNlLnVybC5z ZWFyY2goImltYWdlLmh0bWwiKSAhPT0gLTEpIHsKICAgICAgICAgICAgICAgdmFyIGV4cGVjdGVk TGVuZ3RoID0gODc7CiAgICAgICAgICAgICAgIHRlc3QuYXNzZXJ0VHJ1ZSgKICAgICAgICAgICAg ICAgICAgIHJlc291cmNlLmNvbnRlbnRMZW5ndGggPD0gZXhwZWN0ZWRMZW5ndGgsCkBAIC00NzAs NyArNDcwLDcgQEAgVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0U2hvd1NjcmlwdHNUYWIgPSBmdW5j dGlvbigpCiAgICAgdGhpcy5zaG93UGFuZWwoInNjcmlwdHMiKTsKICAgICB2YXIgdGVzdCA9IHRo aXM7CiAgICAgLy8gVGhlcmUgc2hvdWxkIGJlIGF0IGxlYXN0IG1haW4gcGFnZSBzY3JpcHQuCi0g ICAgdGhpcy5fd2FpdFVudGlsU2NyaXB0c0FyZVBhcnNlZChbImRlYnVnZ2VyX3Rlc3RfcGFnZS5o dG1sJCJdLAorICAgIHRoaXMuX3dhaXRVbnRpbFNjcmlwdHNBcmVQYXJzZWQoWyJkZWJ1Z2dlcl90 ZXN0X3BhZ2UuaHRtbCJdLAogICAgICAgICBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIHRlc3Qu cmVsZWFzZUNvbnRyb2woKTsKICAgICAgICAgfSk7CkBAIC01MDIsNyArNTAyLDcgQEAgVGVzdFN1 aXRlLnByb3RvdHlwZS50ZXN0U2NyaXB0c1RhYklzUG9wdWxhdGVkT25JbnNwZWN0ZWRQYWdlUmVm cmVzaCA9IGZ1bmN0aW9uKCkKICAgICAgICAgdmFyIHBhcnNlZCA9IGRldnRvb2xzLnRvb2xzLmdl dERlYnVnZ2VyQWdlbnQoKS5wYXJzZWRTY3JpcHRzXzsKICAgICAgICAgZm9yICh2YXIgaWQgaW4g cGFyc2VkKSB7CiAgICAgICAgICAgICB2YXIgdXJsID0gcGFyc2VkW2lkXS5nZXRVcmwoKTsKLSAg ICAgICAgICAgIGlmICh1cmwgJiYgdXJsLnNlYXJjaCgiZGVidWdnZXJfdGVzdF9wYWdlLmh0bWwk IikgIT09IC0xKSB7CisgICAgICAgICAgICBpZiAodXJsICYmIHVybC5zZWFyY2goImRlYnVnZ2Vy X3Rlc3RfcGFnZS5odG1sIikgIT09IC0xKSB7CiAgICAgICAgICAgICAgICAgY2hlY2tTY3JpcHRz UGFuZWwoKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CkBAIC01MTIs NyArNTEyLDcgQEAgVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0U2NyaXB0c1RhYklzUG9wdWxhdGVk T25JbnNwZWN0ZWRQYWdlUmVmcmVzaCA9IGZ1bmN0aW9uKCkKIAogICAgIGZ1bmN0aW9uIGNoZWNr U2NyaXB0c1BhbmVsKCkgewogICAgICAgICB0ZXN0LnNob3dQYW5lbCgic2NyaXB0cyIpOwotICAg ICAgICB0ZXN0LmFzc2VydFRydWUodGVzdC5fc2NyaXB0c0FyZVBhcnNlZChbImRlYnVnZ2VyX3Rl c3RfcGFnZS5odG1sJCJdKSwgIkluc3BlY3RlZCBzY3JpcHQgbm90IGZvdW5kIGluIHRoZSBzY3Jp cHRzIGxpc3QiKTsKKyAgICAgICAgdGVzdC5hc3NlcnRUcnVlKHRlc3QuX3NjcmlwdHNBcmVQYXJz ZWQoWyJkZWJ1Z2dlcl90ZXN0X3BhZ2UuaHRtbCJdKSwgIkluc3BlY3RlZCBzY3JpcHQgbm90IGZv dW5kIGluIHRoZSBzY3JpcHRzIGxpc3QiKTsKICAgICAgICAgdGVzdC5yZWxlYXNlQ29udHJvbCgp OwogICAgIH0KIApAQCAtNTMwLDcgKzUzMCw3IEBAIFRlc3RTdWl0ZS5wcm90b3R5cGUudGVzdENv bnRlbnRTY3JpcHRJc1ByZXNlbnQgPSBmdW5jdGlvbigpCiAgICAgdmFyIHRlc3QgPSB0aGlzOwog CiAgICAgdGVzdC5fd2FpdFVudGlsU2NyaXB0c0FyZVBhcnNlZCgKLSAgICAgICAgWyJwYWdlX3dp dGhfY29udGVudF9zY3JpcHQuaHRtbCQiLCAic2ltcGxlX2NvbnRlbnRfc2NyaXB0LmpzJCJdLAor ICAgICAgICBbInBhZ2Vfd2l0aF9jb250ZW50X3NjcmlwdC5odG1sIiwgInNpbXBsZV9jb250ZW50 X3NjcmlwdC5qcyJdLAogICAgICAgICBmdW5jdGlvbigpIHsKICAgICAgICAgICB0ZXN0LnJlbGVh c2VDb250cm9sKCk7CiAgICAgICAgIH0pOwpAQCAtNTY4LDcgKzU2OCw3IEBAIFRlc3RTdWl0ZS5w cm90b3R5cGUudGVzdE5vU2NyaXB0RHVwbGljYXRlc09uUGFuZWxTd2l0Y2ggPSBmdW5jdGlvbigp CiAKICAgICBmdW5jdGlvbiBjaGVja1NjcmlwdHNQYW5lbCgpIHsKICAgICAgICAgdGVzdC5hc3Nl cnRUcnVlKCEhV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnZpc2libGVWaWV3LCAiTm8gdmlz aWJsZSBzY3JpcHQgdmlldy4iKTsKLSAgICAgICAgdGVzdC5hc3NlcnRUcnVlKHRlc3QuX3Njcmlw dHNBcmVQYXJzZWQoWyJkZWJ1Z2dlcl90ZXN0X3BhZ2UuaHRtbCQiXSksICJTb21lIHNjcmlwdHMg YXJlIG1pc3NpbmcuIik7CisgICAgICAgIHRlc3QuYXNzZXJ0VHJ1ZSh0ZXN0Ll9zY3JpcHRzQXJl UGFyc2VkKFsiZGVidWdnZXJfdGVzdF9wYWdlLmh0bWwiXSksICJTb21lIHNjcmlwdHMgYXJlIG1p c3NpbmcuIik7CiAgICAgICAgIGNoZWNrTm9EdXBsaWNhdGVzKCk7CiAgICAgICAgIHRlc3QucmVs ZWFzZUNvbnRyb2woKTsKICAgICB9CkBAIC01ODQsNyArNTg0LDcgQEAgVGVzdFN1aXRlLnByb3Rv dHlwZS50ZXN0Tm9TY3JpcHREdXBsaWNhdGVzT25QYW5lbFN3aXRjaCA9IGZ1bmN0aW9uKCkKICAg ICB9CiAKICAgICB0ZXN0Ll93YWl0VW50aWxTY3JpcHRzQXJlUGFyc2VkKAotICAgICAgICBbImRl YnVnZ2VyX3Rlc3RfcGFnZS5odG1sJCJdLAorICAgICAgICBbImRlYnVnZ2VyX3Rlc3RfcGFnZS5o dG1sIl0sCiAgICAgICAgIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgY2hlY2tOb0R1cGxpY2F0 ZXMoKTsKICAgICAgICAgICAgIHNldFRpbWVvdXQoc3dpdGNoVG9FbGVtZW50c1RhYiwgMCk7CkBA IC02NDMsNyArNjQzLDcgQEAgVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0UGF1c2VPbkV4Y2VwdGlv biA9IGZ1bmN0aW9uKCkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwucGF1 c2VPbkV4Y2VwdGlvbkJ1dHRvbi5lbGVtZW50LmNsaWNrKCk7CiAgICAgfQogCi0gICAgdGhpcy5f ZXhlY3V0ZUNvZGVXaGVuU2NyaXB0c0FyZVBhcnNlZCgiaGFuZGxlQ2xpY2soKSIsIFsicGF1c2Vf b25fZXhjZXB0aW9uLmh0bWwkIl0pOworICAgIHRoaXMuX2V4ZWN1dGVDb2RlV2hlblNjcmlwdHNB cmVQYXJzZWQoImhhbmRsZUNsaWNrKCkiLCBbInBhdXNlX29uX2V4Y2VwdGlvbi5odG1sIl0pOwog CiAgICAgdGhpcy5fd2FpdEZvclNjcmlwdFBhdXNlKAogICAgICAgICB7CkBAIC05MTMsNyArOTEz LDcgQEAgVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0Q29tcGxldGlvbk9uUGF1c2UgPSBmdW5jdGlv bigpCiB7CiAgICAgdGhpcy5zaG93UGFuZWwoInNjcmlwdHMiKTsKICAgICB2YXIgdGVzdCA9IHRo aXM7Ci0gICAgdGhpcy5fZXhlY3V0ZUNvZGVXaGVuU2NyaXB0c0FyZVBhcnNlZCgiaGFuZGxlQ2xp Y2soKSIsIFsiY29tcGxldGlvbl9vbl9wYXVzZS5odG1sJCJdKTsKKyAgICB0aGlzLl9leGVjdXRl Q29kZVdoZW5TY3JpcHRzQXJlUGFyc2VkKCJoYW5kbGVDbGljaygpIiwgWyJjb21wbGV0aW9uX29u X3BhdXNlLmh0bWwiXSk7CiAKICAgICB0aGlzLl93YWl0Rm9yU2NyaXB0UGF1c2UoCiAgICAgICAg IHsKQEAgLTk3NCw3ICs5NzQsNyBAQCBUZXN0U3VpdGUucHJvdG90eXBlLnRlc3RBdXRvQ29udGlu dWVPblN5bnRheEVycm9yID0gZnVuY3Rpb24oKQogICAgICAgICAvLyBJbmplY3RlZFNjcmlwdC5f ZW5zdXJlQ29tbWFuZExpbmVBUElJbnN0YWxsZWQpIHNpbmNlIHRoZSBwYWdlIHNjcmlwdAogICAg ICAgICAvLyBjb250YWlucyBhIHN5bnRheCBlcnJvci4KICAgICAgICAgZm9yICh2YXIgaSA9IDAg OyBpIDwgb3B0aW9ucy5sZW5ndGg7IGkrKykgewotICAgICAgICAgICAgaWYgKG9wdGlvbnNbaV0u dGV4dC5zZWFyY2goInNjcmlwdF9zeW50YXhfZXJyb3IuaHRtbCQiKSAhPT0gLTEpCisgICAgICAg ICAgICBpZiAob3B0aW9uc1tpXS50ZXh0LnNlYXJjaCgic2NyaXB0X3N5bnRheF9lcnJvci5odG1s IikgIT09IC0xKQogICAgICAgICAgICAgICAgIHRlc3QuZmFpbCgiU2NyaXB0IHdpdGggc3ludGF4 IGVycm9yIHNob3VsZCBub3QgYmUgaW4gdGhlIGxpc3Qgb2YgcGFyc2VkIHNjcmlwdHMuIik7CiAg ICAgICAgIH0KICAgICB9CkBAIC0xMTczLDcgKzExNzMsNyBAQCBUZXN0U3VpdGUucHJvdG90eXBl Ll93YWl0VW50aWxTY3JpcHRzQXJlUGFyc2VkID0gZnVuY3Rpb24oZXhwZWN0ZWRTY3JpcHRzLCBj YWxsYgogICovCiBUZXN0U3VpdGUucHJvdG90eXBlLl9leGVjdXRlRnVuY3Rpb25Gb3JTdGVwVGVz dCA9IGZ1bmN0aW9uKCkKIHsKLSAgICB0aGlzLl9leGVjdXRlQ29kZVdoZW5TY3JpcHRzQXJlUGFy c2VkKCJhKCkiLCBbImRlYnVnZ2VyX3N0ZXAuaHRtbCQiLCAiZGVidWdnZXJfc3RlcC5qcyQiXSk7 CisgICAgdGhpcy5fZXhlY3V0ZUNvZGVXaGVuU2NyaXB0c0FyZVBhcnNlZCgiYSgpIiwgWyJkZWJ1 Z2dlcl9zdGVwLmh0bWwiLCAiZGVidWdnZXJfc3RlcC5qcyJdKTsKIH07CiAKIApAQCAtMTQzNyw3 ICsxNDM3LDcgQEAgVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0RXhwYW5kU2NvcGUgPSBmdW5jdGlv bigpCiAgICAgdGhpcy5zaG93UGFuZWwoInNjcmlwdHMiKTsKICAgICB2YXIgdGVzdCA9IHRoaXM7 CiAKLSAgICB0aGlzLl9leGVjdXRlQ29kZVdoZW5TY3JpcHRzQXJlUGFyc2VkKCJoYW5kbGVDbGlj aygpIiwgWyJkZWJ1Z2dlcl9jbG9zdXJlLmh0bWwkIl0pOworICAgIHRoaXMuX2V4ZWN1dGVDb2Rl V2hlblNjcmlwdHNBcmVQYXJzZWQoImhhbmRsZUNsaWNrKCkiLCBbImRlYnVnZ2VyX2Nsb3N1cmUu aHRtbCJdKTsKIAogICAgIHRoaXMuX3dhaXRGb3JTY3JpcHRQYXVzZSgKICAgICAgICAgewpAQCAt MTU1MSw3ICsxNTUxLDcgQEAgVGVzdFN1aXRlLnByb3RvdHlwZS50ZXN0RGVidWdJbnRyaW5zaWNQ cm9wZXJ0aWVzID0gZnVuY3Rpb24oKQogICAgIHRoaXMuc2hvd1BhbmVsKCJzY3JpcHRzIik7CiAg ICAgdmFyIHRlc3QgPSB0aGlzOwogCi0gICAgdGhpcy5fZXhlY3V0ZUNvZGVXaGVuU2NyaXB0c0Fy ZVBhcnNlZCgiaGFuZGxlQ2xpY2soKSIsIFsiZGVidWdnZXJfaW50cmluc2ljX3Byb3BlcnRpZXMu aHRtbCQiXSk7CisgICAgdGhpcy5fZXhlY3V0ZUNvZGVXaGVuU2NyaXB0c0FyZVBhcnNlZCgiaGFu ZGxlQ2xpY2soKSIsIFsiZGVidWdnZXJfaW50cmluc2ljX3Byb3BlcnRpZXMuaHRtbCJdKTsKIAog ICAgIHRoaXMuX3dhaXRGb3JTY3JpcHRQYXVzZSgKICAgICAgICAgewo=