28448 2009-08-18 23:33:44 -0700 convert FormatBlock candidate tag list from if chain to hash lookup 2009-08-19 01:11:21 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 141409 0 mjs 2009-08-18 23:33:44 -0700 the validBlockTag() function does a long nested chain of if comparisons to C strings, which is lame. A hash lookup would be better. 141410 1 35103 mjs 2009-08-18 23:34:51 -0700 Created attachment 35103 patch v1 141412 2 35103 darin 2009-08-18 23:36:00 -0700 Comment on attachment 35103 patch v1 What about empty string and null string? Does the contains function do the right thing for those? 141414 3 35103 hyatt 2009-08-18 23:36:51 -0700 Comment on attachment 35103 patch v1 r=me 141421 4 35104 mjs 2009-08-19 00:00:36 -0700 Created attachment 35104 patch v2 Last version had a bug, as pointed out by Darin. 141439 5 35104 oliver 2009-08-19 01:01:39 -0700 Comment on attachment 35104 patch v2 r=me 141442 6 mjs 2009-08-19 01:11:21 -0700 Committed r47499: <http://trac.webkit.org/changeset/47499> 35103 2009-08-18 23:34:51 -0700 2009-08-19 00:01:15 -0700 patch v1 valid-tag-name-cleanup.patch.txt text/plain 3123 mjs SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzQ5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDgtMTggIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBj b252ZXJ0IEZvcm1hdEJsb2NrIGNhbmRpZGF0ZSB0YWcgbGlzdCBmcm9tIGlmIGNoYWluIHRvIGhh c2ggbG9va3VwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yODQ0OAorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZSwganVzdCBjbGVhbnVwLgorCisg ICAgICAgICogZWRpdGluZy9odG1sZWRpdGluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2YWxp ZEJsb2NrVGFnKToKKyAgICAgICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5nLmg6CisKIDIwMDktMDgt MTggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE1hY2llaiBTdGFjaG93aWFrLgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0 aW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCShy ZXZpc2lvbiA0NzQ4OSkKKysrIFdlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQ1OSwyNiArNDU5LDI3IEBAIGJvb2wgaXNTcGVjaWFsRWxlbWVudChjb25z dCBOb2RlICpuKQogfQogCiAvLyBDaGVja3MgaWYgYSBzdHJpbmcgaXMgYSB2YWxpZCB0YWcgZm9y IHRoZSBGb3JtYXRCbG9ja0NvbW1hbmQgZnVuY3Rpb24gb2YgZXhlY0NvbW1hbmQuIEV4cGVjdHMg bG93ZXIgY2FzZSBzdHJpbmdzLgotYm9vbCB2YWxpZEJsb2NrVGFnKGNvbnN0IFN0cmluZyYgYmxv Y2tUYWcpCitib29sIHZhbGlkQmxvY2tUYWcoY29uc3QgQXRvbWljU3RyaW5nJiBibG9ja1RhZykK IHsKLSAgICAvLyBGSVhNRTogY29udmVydCB0aGlzIHRvIGEgSGFzaFNldAotICAgIGlmIChibG9j a1RhZyA9PSAiYWRkcmVzcyIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImJsb2NrcXVvdGUiIHx8 Ci0gICAgICAgIGJsb2NrVGFnID09ICJkZCIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImRpdiIg fHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImRsIiB8fAotICAgICAgICBibG9ja1RhZyA9PSAiZHQi IHx8Ci0gICAgICAgIGJsb2NrVGFnID09ICJoMSIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImgy IiB8fAotICAgICAgICBibG9ja1RhZyA9PSAiaDMiIHx8Ci0gICAgICAgIGJsb2NrVGFnID09ICJo NCIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImg1IiB8fAotICAgICAgICBibG9ja1RhZyA9PSAi aDYiIHx8Ci0gICAgICAgIGJsb2NrVGFnID09ICJuYXYiIHx8Ci0gICAgICAgIGJsb2NrVGFnID09 ICJwIiB8fAotICAgICAgICBibG9ja1RhZyA9PSAicHJlIikKLSAgICAgICAgcmV0dXJuIHRydWU7 Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIERFRklORV9TVEFUSUNfTE9DQUwoSGFzaFNldDxBdG9t aWNTdHJpbmc+LCBibG9ja1RhZ3MsICgpKTsKKyAgICBpZiAoYmxvY2tUYWdzLmlzRW1wdHkoKSkg eworICAgICAgICBibG9ja1RhZ3MuYWRkKGFkZHJlc3NUYWcubG9jYWxOYW1lKCkpOworICAgICAg ICBibG9ja1RhZ3MuYWRkKGJsb2NrcXVvdGVUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBibG9j a1RhZ3MuYWRkKGRkVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChkaXZU YWcubG9jYWxOYW1lKCkpOworICAgICAgICBibG9ja1RhZ3MuYWRkKGRsVGFnLmxvY2FsTmFtZSgp KTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChkdFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGJs b2NrVGFncy5hZGQoaDFUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBibG9ja1RhZ3MuYWRkKGgy VGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChoM1RhZy5sb2NhbE5hbWUo KSk7CisgICAgICAgIGJsb2NrVGFncy5hZGQoaDRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBi bG9ja1RhZ3MuYWRkKGg1VGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZCho NlRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGJsb2NrVGFncy5hZGQobmF2VGFnLmxvY2FsTmFt ZSgpKTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChwVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAg YmxvY2tUYWdzLmFkZChwcmVUYWcubG9jYWxOYW1lKCkpOworICAgIH0KKyAgICByZXR1cm4gYmxv Y2tUYWdzLmNvbnRhaW5zKGJsb2NrVGFnKTsKIH0KIAogc3RhdGljIE5vZGUqIGZpcnN0SW5TcGVj aWFsRWxlbWVudChjb25zdCBQb3NpdGlvbiYgcG9zKQpJbmRleDogV2ViQ29yZS9lZGl0aW5nL2h0 bWxlZGl0aW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgJ KHJldmlzaW9uIDQ3NDg4KQorKysgV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgJKHdvcmtp bmcgY29weSkKQEAgLTgxLDcgKzgxLDcgQEAgUGFzc1JlZlB0cjxSYW5nZT4gYXZvaWRJbnRlcnNl Y3Rpb25XaXRoTgogVmlzaWJsZVNlbGVjdGlvbiBhdm9pZEludGVyc2VjdGlvbldpdGhOb2RlKGNv bnN0IFZpc2libGVTZWxlY3Rpb24mLCBOb2RlKik7CiAKIGJvb2wgaXNTcGVjaWFsRWxlbWVudChj b25zdCBOb2RlKik7Ci1ib29sIHZhbGlkQmxvY2tUYWcoY29uc3QgU3RyaW5nJik7Citib29sIHZh bGlkQmxvY2tUYWcoY29uc3QgQXRvbWljU3RyaW5nJik7CiAKIFBhc3NSZWZQdHI8SFRNTEVsZW1l bnQ+IGNyZWF0ZURlZmF1bHRQYXJhZ3JhcGhFbGVtZW50KERvY3VtZW50Kik7CiBQYXNzUmVmUHRy PEhUTUxFbGVtZW50PiBjcmVhdGVCcmVha0VsZW1lbnQoRG9jdW1lbnQqKTsK 35104 2009-08-19 00:00:36 -0700 2009-08-19 01:01:39 -0700 patch v2 valid-tag-name-cleanup.patch.txt text/plain 3177 mjs SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzQ5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDgtMTggIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBj b252ZXJ0IEZvcm1hdEJsb2NrIGNhbmRpZGF0ZSB0YWcgbGlzdCBmcm9tIGlmIGNoYWluIHRvIGhh c2ggbG9va3VwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yODQ0OAorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZSwganVzdCBjbGVhbnVwLgorCisg ICAgICAgICogZWRpdGluZy9odG1sZWRpdGluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2YWxp ZEJsb2NrVGFnKToKKyAgICAgICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5nLmg6CisKIDIwMDktMDgt MTggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE1hY2llaiBTdGFjaG93aWFrLgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0 aW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCShy ZXZpc2lvbiA0NzQ4OSkKKysrIFdlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQ1OSwyNiArNDU5LDMwIEBAIGJvb2wgaXNTcGVjaWFsRWxlbWVudChjb25z dCBOb2RlICpuKQogfQogCiAvLyBDaGVja3MgaWYgYSBzdHJpbmcgaXMgYSB2YWxpZCB0YWcgZm9y IHRoZSBGb3JtYXRCbG9ja0NvbW1hbmQgZnVuY3Rpb24gb2YgZXhlY0NvbW1hbmQuIEV4cGVjdHMg bG93ZXIgY2FzZSBzdHJpbmdzLgotYm9vbCB2YWxpZEJsb2NrVGFnKGNvbnN0IFN0cmluZyYgYmxv Y2tUYWcpCitib29sIHZhbGlkQmxvY2tUYWcoY29uc3QgQXRvbWljU3RyaW5nJiBibG9ja1RhZykK IHsKLSAgICAvLyBGSVhNRTogY29udmVydCB0aGlzIHRvIGEgSGFzaFNldAotICAgIGlmIChibG9j a1RhZyA9PSAiYWRkcmVzcyIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImJsb2NrcXVvdGUiIHx8 Ci0gICAgICAgIGJsb2NrVGFnID09ICJkZCIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImRpdiIg fHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImRsIiB8fAotICAgICAgICBibG9ja1RhZyA9PSAiZHQi IHx8Ci0gICAgICAgIGJsb2NrVGFnID09ICJoMSIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImgy IiB8fAotICAgICAgICBibG9ja1RhZyA9PSAiaDMiIHx8Ci0gICAgICAgIGJsb2NrVGFnID09ICJo NCIgfHwKLSAgICAgICAgYmxvY2tUYWcgPT0gImg1IiB8fAotICAgICAgICBibG9ja1RhZyA9PSAi aDYiIHx8Ci0gICAgICAgIGJsb2NrVGFnID09ICJuYXYiIHx8Ci0gICAgICAgIGJsb2NrVGFnID09 ICJwIiB8fAotICAgICAgICBibG9ja1RhZyA9PSAicHJlIikKLSAgICAgICAgcmV0dXJuIHRydWU7 Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChibG9ja1RhZy5pc0VtcHR5KCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIERFRklORV9TVEFUSUNfTE9DQUwoSGFzaFNldDxBdG9taWNT dHJpbmc+LCBibG9ja1RhZ3MsICgpKTsKKyAgICBpZiAoYmxvY2tUYWdzLmlzRW1wdHkoKSkgewor ICAgICAgICBibG9ja1RhZ3MuYWRkKGFkZHJlc3NUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBi bG9ja1RhZ3MuYWRkKGJsb2NrcXVvdGVUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBibG9ja1Rh Z3MuYWRkKGRkVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChkaXZUYWcu bG9jYWxOYW1lKCkpOworICAgICAgICBibG9ja1RhZ3MuYWRkKGRsVGFnLmxvY2FsTmFtZSgpKTsK KyAgICAgICAgYmxvY2tUYWdzLmFkZChkdFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGJsb2Nr VGFncy5hZGQoaDFUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBibG9ja1RhZ3MuYWRkKGgyVGFn LmxvY2FsTmFtZSgpKTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChoM1RhZy5sb2NhbE5hbWUoKSk7 CisgICAgICAgIGJsb2NrVGFncy5hZGQoaDRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBibG9j a1RhZ3MuYWRkKGg1VGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChoNlRh Zy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGJsb2NrVGFncy5hZGQobmF2VGFnLmxvY2FsTmFtZSgp KTsKKyAgICAgICAgYmxvY2tUYWdzLmFkZChwVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgYmxv Y2tUYWdzLmFkZChwcmVUYWcubG9jYWxOYW1lKCkpOworICAgIH0KKyAgICByZXR1cm4gYmxvY2tU YWdzLmNvbnRhaW5zKGJsb2NrVGFnKTsKIH0KIAogc3RhdGljIE5vZGUqIGZpcnN0SW5TcGVjaWFs RWxlbWVudChjb25zdCBQb3NpdGlvbiYgcG9zKQpJbmRleDogV2ViQ29yZS9lZGl0aW5nL2h0bWxl ZGl0aW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgJKHJl dmlzaW9uIDQ3NDg4KQorKysgV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgJKHdvcmtpbmcg Y29weSkKQEAgLTgxLDcgKzgxLDcgQEAgUGFzc1JlZlB0cjxSYW5nZT4gYXZvaWRJbnRlcnNlY3Rp b25XaXRoTgogVmlzaWJsZVNlbGVjdGlvbiBhdm9pZEludGVyc2VjdGlvbldpdGhOb2RlKGNvbnN0 IFZpc2libGVTZWxlY3Rpb24mLCBOb2RlKik7CiAKIGJvb2wgaXNTcGVjaWFsRWxlbWVudChjb25z dCBOb2RlKik7Ci1ib29sIHZhbGlkQmxvY2tUYWcoY29uc3QgU3RyaW5nJik7Citib29sIHZhbGlk QmxvY2tUYWcoY29uc3QgQXRvbWljU3RyaW5nJik7CiAKIFBhc3NSZWZQdHI8SFRNTEVsZW1lbnQ+ IGNyZWF0ZURlZmF1bHRQYXJhZ3JhcGhFbGVtZW50KERvY3VtZW50Kik7CiBQYXNzUmVmUHRyPEhU TUxFbGVtZW50PiBjcmVhdGVCcmVha0VsZW1lbnQoRG9jdW1lbnQqKTsK