130166 2014-03-12 16:42:55 -0700 Web Inspector: Fix multiple console.assert stripping issues 2014-03-12 17:35:46 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned bburg graouts joepeck timothy webkit-bug-importer oldest_to_newest 989859 0 joepeck 2014-03-12 16:42:55 -0700 - one console.assert missing semicolon, assumed to be multi-line, not stripped - one console.assert inside of a for loop without braces, results in following line accidentally looping! I plan on adding a WARNING to catch the second error. 989862 1 joepeck 2014-03-12 16:50:52 -0700 With the new warning, and a script to process each JS file of ours, this is the output I see: shell> ./Scripts/remove-console-asserts-dryrun.rb DOMTreeManager.js: WARNING: console.assert inside control flow statement without braces on line: 556: console.assert(contentFlow.contentNodes[i].id === flowPayload.content[i]); DataGrid.js: WARNING: Multi-line console.assert on line 775: console.assert(!child.isPlaceholderNode, "Shouldn't delete the placeholder node.") 989864 2 joepeck 2014-03-12 17:00:32 -0700 If the line ends in a ')' then its likely not multi-line and just a missing semicolon. Changed that warning to: DataGrid.js: WARNING: console.assert missing trailing semicolon on line 775: console.assert(!child.isPlaceholderNode, "Shouldn't delete the placeholder node.") 989865 3 226560 joepeck 2014-03-12 17:03:11 -0700 Created attachment 226560 [PATCH] Proposed Fix 989881 4 joepeck 2014-03-12 17:35:46 -0700 <http://trac.webkit.org/changeset/165516> 226560 2014-03-12 17:03:11 -0700 2014-03-12 17:14:43 -0700 [PATCH] Proposed Fix assert.patch text/plain 5850 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ1ZTdhOGEuLmNkODUxYzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTAzLTEyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IG11 bHRpcGxlIGNvbnNvbGUuYXNzZXJ0IHN0cmlwcGluZyBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDE2NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIHdlcmUgYSBjb3VwbGUgY29uc29s ZS5hc3NlcnQgc3RyaXBwaW5nIGlzc3VlcyBpbiBwcm9kdWN0aW9uLgorICAgICAgICBPbmUgbGlu ZSByZXF1aXJlZCBhIHNlbWljb2xvbiBzbyB3YXMgYXZvaWRpbmcgZ2V0dGluZyBzdHJpcHBlZC4K KyAgICAgICAgT25lIHJlc3VsdGVkIGluIGEgbG9naWMgY2hhbmdlLCB3aGVuIHN0cmlwcGluZyB0 aGUgb25seSBzdGF0ZW1lbnQKKyAgICAgICAgb2YgYSBjb250cm9sIGZsb3cgYmxvY2suIEFkZCBh IHdhcm5pbmcgZm9yIHN1Y2ggY2FzZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3JlbW92ZS1jb25z b2xlLWFzc2VydHMucGw6CisgICAgICAgIEFkZCB3YXJuaW5nIGZvciBhIGNvbnNvbGUuYXNzZXJ0 IGJlaW5nIHRoZSBvbmx5IHN0YXRlbWVudCBpbiBhIGNvbnRyb2wgZmxvdyBibG9jaworICAgICAg ICB3aXRob3V0IGJyYWNlcy4gV2hlbiBpdCBpcyBzdHJpcHBlZCBpdCBtYXkgY2hhbmdlIHRoZSBm bG93IG9mIHRoZSBmdW5jdGlvbi4KKworICAgICAgICAqIFNjcmlwdHMvcmVtb3ZlLWNvbnNvbGUt YXNzZXJ0cy1kcnlydW4ucmI6IEFkZGVkLgorICAgICAgICBBZGQgYSBzY3JpcHQgdG8gcXVpY2ts eSB0ZXN0IHJ1bm5pbmcgcmVtb3ZlIGNvbnNvbGUgYXNzZXJ0cyBvbiBvdXIgZmlsZXMsIHRvCisg ICAgICAgIGhlbHAgY2F0Y2ggZXJyb3JzIG5vdCBpbiBhIHByb2R1Y3Rpb24gYnVpbGQgYW5kIGlu IHRoZSBvcmlnaW5hbCBub24tY29tYmluZWQKKyAgICAgICAgZmlsZXMsIHNvIHlvdSBjYW4gbW9y ZSBlYXNpbHkgZml4IGlzc3Vlcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvRE9NVHJlZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFn ZXIucHJvdG90eXBlLl91cGRhdGVDb250ZW50Rmxvd0Zyb21QYXlsb2FkKToKKyAgICAgICAgQ29u dmVydCB0aGUgZm9yIGxvb3AgaW50byBhIHNpbmdsZSBjb25zb2xlLmFzc2VydCBzdGF0ZW1lbnQu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5yZW1vdmVDaGlsZCk6CisgICAgICAgIEFk ZCBtaXNzaW5nIHNlbWljb2xvbi4gICAgICAgIAorCiAyMDE0LTAzLTEyICBCcmlhbiBCdXJnICA8 YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbnZlcnQgbW9kZWwg dGVzdHMgYW5kIGluc3BlY3Rvci10ZXN0LmpzIHRvIHVzZSBUZXN0Lmh0bWwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL3JlbW92ZS1jb25zb2xlLWFzc2VydHMtZHJ5 cnVuLnJiIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvcmVtb3ZlLWNvbnNvbGUtYXNz ZXJ0cy1kcnlydW4ucmIKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uM2VjZmY1 OAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL3JlbW92 ZS1jb25zb2xlLWFzc2VydHMtZHJ5cnVuLnJiCkBAIC0wLDAgKzEsMjMgQEAKKyMhL3Vzci9iaW4v cnVieQorCityZXF1aXJlICJmaW5kIgorCiskdmVyYm9zZSA9IEFSR1YuaW5jbHVkZT8oIi0tdmVy Ym9zZSIpOworJHJlbW92ZV9jb25zb2xlX2Fzc2VydHNfcGF0aCA9IEZpbGUuZXhwYW5kX3BhdGgg RmlsZS5qb2luKEZpbGUuZGlybmFtZShfX0ZJTEVfXyksICJyZW1vdmUtY29uc29sZS1hc3NlcnRz LnBsIikKKyR3ZWJfaW5zcGVjdG9yX3VzZXJfaW50ZXJmYWNlX3BhdGggPSBGaWxlLmV4cGFuZF9w YXRoIEZpbGUuam9pbihGaWxlLmRpcm5hbWUoX19GSUxFX18pLCAiLi4iLCAiVXNlckludGVyZmFj ZSIpCisKK0ZpbmQuZmluZCgkd2ViX2luc3BlY3Rvcl91c2VyX2ludGVyZmFjZV9wYXRoKSBkbyB8 cGF0aHwKKyAgIyBTa2lwIGRpcmVjdG9yaWVzLCBFeHRlcm5hbCwgSW1hZ2VzLCBhbmQgbm9uLWpz LgorICBuZXh0IGlmIEZpbGUuZGlyZWN0b3J5PyhwYXRoKQorICBuZXh0IGlmIHBhdGggPX4gL1wv KEV4dGVybmFsfEltYWdlcylcLy8KKyAgbmV4dCBpZiBwYXRoICF+IC9cLmpzJC8KKworICAjIFJ1 biByZW1vdmUtY29uc29sZS1hc3NlcnRzIG9uIGVhY2ggZmlsZS4KKyAgcHV0cyAiQ2hlY2tpbmc6 ICN7cGF0aH0gLi4uIiBpZiAkdmVyYm9zZQorICBvdXRwdXQgPSAleHsgcGVybCAnI3skcmVtb3Zl X2NvbnNvbGVfYXNzZXJ0c19wYXRofScgLS1pbnB1dC1zY3JpcHQgJyN7cGF0aH0nIC0tb3V0cHV0 LXNjcmlwdCAvZGV2L251bGwgfQorICBpZiAhb3V0cHV0LmVtcHR5PworICAgIHB1dHMgIiN7Rmls ZS5iYXNlbmFtZShwYXRoKX06IgorICAgIHB1dHMgb3V0cHV0CisgICAgcHV0cworICBlbmQKK2Vu ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvcmVtb3ZlLWNvbnNv bGUtYXNzZXJ0cy5wbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9TY3JpcHRzL3JlbW92ZS1jb25z b2xlLWFzc2VydHMucGwKaW5kZXggOGM1NDMwZi4uYjY1YmFjMSAxMDA3NTUKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1NjcmlwdHMvcmVtb3ZlLWNvbnNvbGUtYXNzZXJ0cy5wbAorKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9yZW1vdmUtY29uc29sZS1hc3NlcnRzLnBsCkBA IC0xOSwxMCArMTksMjcgQEAgdW5sZXNzIChkZWZpbmVkICRpbnB1dFNjcmlwdEZpbGVuYW1lIGFu ZCBkZWZpbmVkICRvdXRwdXRTY3JpcHRGaWxlbmFtZSkgewogb3BlbiBJTiwgJGlucHV0U2NyaXB0 RmlsZW5hbWUgb3IgZGllOwogb3VyICgkb3V0LCAkdGVtcEZpbGVuYW1lKSA9IHRlbXBmaWxlKFVO TElOSyA9PiAwKSBvciBkaWU7CiAKK291ciAkcHJldmlvdXNMaW5lID0gIiI7CiB3aGlsZSAoPElO PikgeworICAgICMgV2FybiBhYm91dCBjb25zb2xlLmFzc2VydCBpbiBjb250cm9sIGZsb3cgc3Rh dGVtZW50IHdpdGhvdXQgYnJhY2VzLiBDYW4gY2hhbmdlIGxvZ2ljIHdoZW4gc3RyaXBwZWQuCisg ICAgaWYgKC9jb25zb2xlXC5hc3NlcnQvKSB7CisgICAgICAgIGlmICgkcHJldmlvdXNMaW5lID1+ IC9eXHMqKGZvcnxpZnxlbHNlfHdoaWxlfGRvKVxiLyAmJiAkcHJldmlvdXNMaW5lICF+IC9ce1xz KiQvKSB7CisgICAgICAgICAgICBwcmludCAiV0FSTklORzogY29uc29sZS5hc3NlcnQgaW5zaWRl IGNvbnRyb2wgZmxvdyBzdGF0ZW1lbnQgd2l0aG91dCBicmFjZXMgb24gbGluZTogJC46ICRfIjsK KyAgICAgICAgfQorICAgIH0KKwogICAgIHMvXHMqY29uc29sZVwuYXNzZXJ0XCguKlwpO1xzKi8v ZzsKICAgICBwcmludCAkb3V0ICRfOwotICAgIHByaW50ICJXQVJOSU5HOiBNdWx0aS1saW5lIGNv bnNvbGUuYXNzZXJ0IG9uIGxpbmUgJC46ICRfIiBpZiAkXyA9fiAvXHMqY29uc29sZVwuYXNzZXJ0 XCgvOworICAgICRwcmV2aW91c0xpbmUgPSAkXyBpZiAkXyAhfiAvXlxzKiQvOworCisgICAgIyBJ ZiBjb25zb2xlLmFzc2VydCBpcyBzdGlsbCBvbiB0aGUgbGluZSwgZWl0aGVyIHdlIG1pc3NlZCBh IHNlbWljb2xvbiBvciBpdCBpcyBtdWx0aS1saW5lLiBUaGVzZSBkaWQgbm90IGdldCBzdHJpcHBl ZC4KKyAgICBpZiAoJF8gPX4gL1xzKmNvbnNvbGVcLmFzc2VydFwoLykgeworICAgICAgICBpZiAo JF8gPX4gL1wpXHMqJC8pIHsKKyAgICAgICAgICAgIHByaW50ICJXQVJOSU5HOiBjb25zb2xlLmFz c2VydCBtaXNzaW5nIHRyYWlsaW5nIHNlbWljb2xvbiBvbiBsaW5lICQuOiAkXyIgOworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgcHJpbnQgIldBUk5JTkc6IE11bHRpLWxpbmUgY29uc29s ZS5hc3NlcnQgb24gbGluZSAkLjogJF8iIDsKKyAgICAgICAgfQorICAgIH0KIH0KIAogY2xvc2Ug JG91dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKaW5kZXggM2YzZTA2ZC4uYTFl MDZiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKQEAgLTU1Miw4ICs1NTIs NyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgIF91cGRh dGVDb250ZW50Rmxvd0Zyb21QYXlsb2FkOiBmdW5jdGlvbihjb250ZW50RmxvdywgZmxvd1BheWxv YWQpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChjb250ZW50Rmxvdy5jb250ZW50Tm9k ZXMubGVuZ3RoID09PSBmbG93UGF5bG9hZC5jb250ZW50Lmxlbmd0aCk7Ci0gICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgY29udGVudEZsb3cuY29udGVudE5vZGVzLmxlbmd0aDsgKytpKQotICAg ICAgICAgICAgY29uc29sZS5hc3NlcnQoY29udGVudEZsb3cuY29udGVudE5vZGVzW2ldLmlkID09 PSBmbG93UGF5bG9hZC5jb250ZW50W2ldKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoY29udGVu dEZsb3cuY29udGVudE5vZGVzLmV2ZXJ5KGZ1bmN0aW9uKG5vZGUsIGkpIHsgbm9kZS5pZCA9PT0g Zmxvd1BheWxvYWQuY29udGVudFtpXTsgfSkpOwogCiAgICAgICAgIC8vIEZJWE1FOiBDb2xsZWN0 IHRoZSByZWdpb25zIGZyb20gdGhlIHBheWxvYWQuCiAgICAgICAgIGNvbnRlbnRGbG93Lm92ZXJz ZXQgPSBmbG93UGF5bG9hZC5vdmVyc2V0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcwppbmRleCBjMWMwZTcwLi43MTA2MjA2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E YXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EYXRhR3JpZC5qcwpAQCAtNzcyLDcgKzc3Miw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLmNoaWxkcmVuLmxlbmd0aCA8PSAwKQogICAg ICAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9IGZhbHNlOwogCi0gICAgICAgIGNvbnNvbGUuYXNz ZXJ0KCFjaGlsZC5pc1BsYWNlaG9sZGVyTm9kZSwgIlNob3VsZG4ndCBkZWxldGUgdGhlIHBsYWNl aG9sZGVyIG5vZGUuIikKKyAgICAgICAgY29uc29sZS5hc3NlcnQoIWNoaWxkLmlzUGxhY2Vob2xk ZXJOb2RlLCAiU2hvdWxkbid0IGRlbGV0ZSB0aGUgcGxhY2Vob2xkZXIgbm9kZS4iKTsKICAgICB9 LAogCiAgICAgcmVtb3ZlQ2hpbGRyZW46IGZ1bmN0aW9uKCkK