157450 2016-05-06 22:38:07 -0700 Web Inspector: Misc CommandLineAPI cleanup 2016-05-06 22:44:35 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1190917 0 joepeck 2016-05-06 22:38:07 -0700 * SUMMARY Misc CommandLineAPI cleanup. Cleanup style and fix a bug in the JSContext BasicCommandLineAPI that slipped in with r200533. 1190920 1 278323 joepeck 2016-05-06 22:39:19 -0700 Created attachment 278323 [PATCH] Proposed Fix 1190922 2 joepeck 2016-05-06 22:44:35 -0700 <http://trac.webkit.org/changeset/200538> 278323 2016-05-06 22:39:19 -0700 2016-05-06 22:42:03 -0700 [PATCH] Proposed Fix modernize-1.patch text/plain 4029 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDAxZDQwNzEuLjUwMzg4ODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDE2LTA1LTA2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWlzYyBD b21tYW5kTGluZUFQSSBjbGVhbnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTc0NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qczoKKyAgICAg ICAgKEJhc2ljQ29tbWFuZExpbmVBUEkpOgorCisyMDE2LTA1LTA2ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92ZSBj b25zb2xlLmNvdW50KCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1NzQzOQogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjYxNTI2NTQ+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNl LmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJj ZS5qcwppbmRleCA2ZWUwZmIxLi5jODE1M2I5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAgLTEzNzQsMjAg KzEzNzQsMTEgQEAgSW5qZWN0ZWRTY3JpcHQuQ2FsbEZyYW1lUHJveHkuX2NyZWF0ZVNjb3BlSnNv biA9IGZ1bmN0aW9uKHNjb3BlVHlwZUNvZGUsIHNjb3BlT2IKIH0KIAogCi1mdW5jdGlvbiBzbGlj ZShhcnJheSwgaW5kZXgpCitmdW5jdGlvbiBiaW5kKGZ1bmMsIHRoaXNPYmplY3QsIC4uLm91dGVy QXJncykKIHsKLSAgICB2YXIgcmVzdWx0ID0gW107Ci0gICAgZm9yICh2YXIgaSA9IGluZGV4IHx8 IDA7IGkgPCBhcnJheS5sZW5ndGg7ICsraSkKLSAgICAgICAgcmVzdWx0LnB1c2goYXJyYXlbaV0p OwotICAgIHJldHVybiByZXN1bHQ7Ci19Ci0KLWZ1bmN0aW9uIGJpbmQoZnVuYywgdGhpc09iamVj dCwgdmFyX2FyZ3MpCi17Ci0gICAgdmFyIGFyZ3MgPSBzbGljZShhcmd1bWVudHMsIDIpOwotICAg IHJldHVybiBmdW5jdGlvbih2YXJfYXJncykgewotICAgICAgICByZXR1cm4gZnVuYy5hcHBseSh0 aGlzT2JqZWN0LCBhcmdzLmNvbmNhdChzbGljZShhcmd1bWVudHMpKSk7Ci0gICAgfQorICAgIHJl dHVybiBmdW5jdGlvbiguLi5pbm5lckFyZ3MpIHsKKyAgICAgICAgcmV0dXJuIGZ1bmMuYXBwbHko dGhpc09iamVjdCwgb3V0ZXJBcmdzLmNvbmNhdChpbm5lckFyZ3MpKTsKKyAgICB9OwogfQogCiBm dW5jdGlvbiBCYXNpY0NvbW1hbmRMaW5lQVBJKGNhbGxGcmFtZSkKQEAgLTEzOTYsMTEgKzEzODcs MTEgQEAgZnVuY3Rpb24gQmFzaWNDb21tYW5kTGluZUFQSShjYWxsRnJhbWUpCiAgICAgdGhpcy4k ZXhjZXB0aW9uID0gaW5qZWN0ZWRTY3JpcHQuX2V4Y2VwdGlvblZhbHVlOwogCiAgICAgLy8gJDEt JDk5Ci0gICAgZm9yICh2YXIgaSA9IDE7IGkgPD0gaW5qZWN0ZWRTY3JpcHQuX3NhdmVkUmVzdWx0 cy5sZW5ndGg7ICsraSkKKyAgICBmb3IgKGxldCBpID0gMTsgaSA8PSBpbmplY3RlZFNjcmlwdC5f c2F2ZWRSZXN1bHRzLmxlbmd0aDsgKytpKQogICAgICAgICB0aGlzLl9fZGVmaW5lR2V0dGVyX18o IiQiICsgaSwgYmluZChpbmplY3RlZFNjcmlwdC5fc2F2ZWRSZXN1bHQsIGluamVjdGVkU2NyaXB0 LCBpKSk7CiAKICAgICAvLyBDb21tYW5kIExpbmUgQVBJIG1ldGhvZHMuCi0gICAgZm9yICh2YXIg aSA9IDA7IGkgPCBCYXNpY0NvbW1hbmRMaW5lQVBJLm1ldGhvZHMubGVuZ3RoOyArK2kpCisgICAg Zm9yIChsZXQgbWV0aG9kIG9mIEJhc2ljQ29tbWFuZExpbmVBUEkubWV0aG9kcykKICAgICAgICAg dGhpc1ttZXRob2QubmFtZV0gPSBtZXRob2Q7CiB9CiAKQEAgLTE0MTMsOCArMTQwNCw4IEBAIEJh c2ljQ29tbWFuZExpbmVBUEkubWV0aG9kcyA9IFsKIAogICAgIGZ1bmN0aW9uIGtleXMob2JqZWN0 KSB7IHJldHVybiBPYmplY3Qua2V5cyhvYmplY3QpOyB9LAogICAgIGZ1bmN0aW9uIHZhbHVlcyhv YmplY3QpIHsKLSAgICAgICAgdmFyIHJlc3VsdCA9IFtdOwotICAgICAgICBmb3IgKHZhciBrZXkg aW4gb2JqZWN0KQorICAgICAgICBsZXQgcmVzdWx0ID0gW107CisgICAgICAgIGZvciAobGV0IGtl eSBpbiBvYmplY3QpCiAgICAgICAgICAgICByZXN1bHQucHVzaChvYmplY3Rba2V5XSk7CiAgICAg ICAgIHJldHVybiByZXN1bHQ7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhOWQ1ZWExLi45Y2NjOWMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMDUtMDYgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBNaXNjIENv bW1hbmRMaW5lQVBJIGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NzQ1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJTW9kdWxlU291cmNlLmpzOgor ICAgICAgICAoYmluZCk6CisKIDIwMTYtMDUtMDYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIElPU19URVhUX0FVVE9TSVpJTkcgb24gTWFj IGFuZCBtYWtlIGl0IHRlc3RhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvQ29tbWFuZExpbmVBUElNb2R1bGVTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvQ29tbWFuZExpbmVBUElNb2R1bGVTb3VyY2UuanMKaW5kZXggNmRhMjQwZS4uNmZmNWE2NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJTW9kdWxl U291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db21tYW5kTGluZUFQSU1v ZHVsZVNvdXJjZS5qcwpAQCAtNDMsNyArNDMsNyBAQCBmdW5jdGlvbiBiaW5kKGZ1bmMsIHRoaXNP YmplY3QsIC4uLm91dGVyQXJncykKIHsKICAgICByZXR1cm4gZnVuY3Rpb24oLi4uaW5uZXJBcmdz KSB7CiAgICAgICAgIHJldHVybiBmdW5jLmFwcGx5KHRoaXNPYmplY3QsIG91dGVyQXJncy5jb25j YXQoaW5uZXJBcmdzKSk7Ci0gICAgfQorICAgIH07CiB9CiAKIC8qKgpAQCAtNjAsNyArNjAsNyBA QCBmdW5jdGlvbiBDb21tYW5kTGluZUFQSShjb21tYW5kTGluZUFQSUltcGwsIGNhbGxGcmFtZSkK ICAgICB0aGlzLl9fZGVmaW5lR2V0dGVyX18oIiQwIiwgYmluZChjb21tYW5kTGluZUFQSUltcGwu X2luc3BlY3RlZE9iamVjdCwgY29tbWFuZExpbmVBUElJbXBsKSk7CiAKICAgICAvLyAkMS0kOTkK LSAgICBmb3IgKHZhciBpID0gMTsgaSA8PSBpbmplY3RlZFNjcmlwdC5fc2F2ZWRSZXN1bHRzLmxl bmd0aDsgKytpKQorICAgIGZvciAobGV0IGkgPSAxOyBpIDw9IGluamVjdGVkU2NyaXB0Ll9zYXZl ZFJlc3VsdHMubGVuZ3RoOyArK2kpCiAgICAgICAgIHRoaXMuX19kZWZpbmVHZXR0ZXJfXygiJCIg KyBpLCBiaW5kKGluamVjdGVkU2NyaXB0Ll9zYXZlZFJlc3VsdCwgaW5qZWN0ZWRTY3JpcHQsIGkp KTsKIAogICAgIC8vIENvbW1hbmQgTGluZSBBUEkgbWV0aG9kcy4K