95276 2012-08-28 18:28:15 -0700 HTMLTokenizer should use the latest EfficientStrings hotness 2012-09-07 11:32:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth benjamin eric webkit.review.bot oldest_to_newest 706971 0 abarth 2012-08-28 18:28:15 -0700 HTMLTokenizer should use the latest EfficientStrings hotness 706972 1 161111 abarth 2012-08-28 18:29:28 -0700 Created attachment 161111 Patch 706975 2 161111 eric 2012-08-28 18:33:51 -0700 Comment on attachment 161111 Patch This still causes a malloc. YOu could do this as part of the DEFINE_STATIC_LOCAL call however. 706978 3 161112 abarth 2012-08-28 18:39:07 -0700 Created attachment 161112 Patch 706980 4 abarth 2012-08-28 18:40:01 -0700 If we're going to do this inside the DEFINE_STATIC_LOCAL, we might as well just use ASCIILiteral then since the strlen only happens once per string. 706985 5 161112 benjamin 2012-08-28 18:52:55 -0700 Comment on attachment 161112 Patch Great! Looking at the implementation of lookAhead(), I think it would be possible to make a version that does not need static or allocations. I don't know if it is worth it or not, it depends on how hot this path is. > Source/WebCore/ChangeLog:9 > + Using ASCIILiteral avoids memcpying the string into the heap and > + therefore uses less total memory. It does not always saves memory (due to the way the allocator works) but it is also always faster ;) 714796 6 161112 webkit.review.bot 2012-09-07 11:32:33 -0700 Comment on attachment 161112 Patch Clearing flags on attachment: 161112 Committed r127899: <http://trac.webkit.org/changeset/127899> 714797 7 webkit.review.bot 2012-09-07 11:32:37 -0700 All reviewed patches have been landed. Closing bug. 161111 2012-08-28 18:29:28 -0700 2012-08-28 18:39:05 -0700 Patch bug-95276-20120828182918.patch text/plain 4025 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjk0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4LTI4ICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSFRNTFRva2VuaXplciBzaG91bGQg dXNlIHRoZSBsYXRlc3QgRWZmaWNpZW50U3RyaW5ncyBob3RuZXNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTI3NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggdGVhY2hlcyBIVE1MVG9r ZW5pemVyIHRvIHVzZSB0aGUgbmV3IGhvdG5lc3MgcmVjb21tZW5kZWQgaW4KKyAgICAgICAgaHR0 cDovL3RyYWMud2Via2l0Lm9yZy93aWtpL0VmZmljaWVudFN0cmluZ3MuICBUaGlzIHBhdHRlcm4g c2hvdWxkIGJlCisgICAgICAgIChtYXJnaW5hbGx5KSBmYXN0ZXIgYW5kIHVzZSAobWFyZ2luYWxs eSkgbGVzcyBtZW1vcnkuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6Om5leHRUb2tlbik6CisKIDIwMTIt MDgtMjggIFRvbSBTZXBleiAgPHRzZXBlekBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ1NQIGRv ZXNuJ3QgdHVybiBvZmYgZXZhbCwgZXRjLiBpbiBXZWIgV29ya2VycwpJbmRleDogU291cmNlL1dl YkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5jcHAJKHJldmlzaW9uIDEyNjk0NikK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUb2tlbml6ZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMDY1LDEwICsxMDY1LDggQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9r ZW4oU2VnbWVudGVkUwogICAgIEVORF9TVEFURSgpCiAKICAgICBIVE1MX0JFR0lOX1NUQVRFKE1h cmt1cERlY2xhcmF0aW9uT3BlblN0YXRlKSB7Ci0gICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwo U3RyaW5nLCBkYXNoRGFzaFN0cmluZywgKCItLSIpKTsKLSAgICAgICAgREVGSU5FX1NUQVRJQ19M T0NBTChTdHJpbmcsIGRvY3R5cGVTdHJpbmcsICgiZG9jdHlwZSIpKTsKLSAgICAgICAgREVGSU5F X1NUQVRJQ19MT0NBTChTdHJpbmcsIGNkYXRhU3RyaW5nLCAoIltDREFUQVsiKSk7CiAgICAgICAg IGlmIChjYyA9PSAnLScpIHsKKyAgICAgICAgICAgIFN0cmluZyBkYXNoRGFzaFN0cmluZygiLS0i LCBTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKICAgICAgICAgICAgIFNlZ21lbnRlZFN0 cmluZzo6TG9va0FoZWFkUmVzdWx0IHJlc3VsdCA9IHNvdXJjZS5sb29rQWhlYWQoZGFzaERhc2hT dHJpbmcpOwogICAgICAgICAgICAgaWYgKHJlc3VsdCA9PSBTZWdtZW50ZWRTdHJpbmc6OkRpZE1h dGNoKSB7CiAgICAgICAgICAgICAgICAgc291cmNlLmFkdmFuY2VBbmRBU1NFUlQoJy0nKTsKQEAg LTEwNzgsNiArMTA3Niw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRl ZFMKICAgICAgICAgICAgIH0gZWxzZSBpZiAocmVzdWx0ID09IFNlZ21lbnRlZFN0cmluZzo6Tm90 RW5vdWdoQ2hhcmFjdGVycykKICAgICAgICAgICAgICAgICByZXR1cm4gaGF2ZUJ1ZmZlcmVkQ2hh cmFjdGVyVG9rZW4oKTsKICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnRCcgfHwgY2MgPT0gJ2Qn KSB7CisgICAgICAgICAgICBTdHJpbmcsIGRvY3R5cGVTdHJpbmcoImRvY3R5cGUiLCBTdHJpbmc6 OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKICAgICAgICAgICAgIFNlZ21lbnRlZFN0cmluZzo6TG9v a0FoZWFkUmVzdWx0IHJlc3VsdCA9IHNvdXJjZS5sb29rQWhlYWRJZ25vcmluZ0Nhc2UoZG9jdHlw ZVN0cmluZyk7CiAgICAgICAgICAgICBpZiAocmVzdWx0ID09IFNlZ21lbnRlZFN0cmluZzo6RGlk TWF0Y2gpIHsKICAgICAgICAgICAgICAgICBhZHZhbmNlU3RyaW5nQW5kQVNTRVJUSWdub3JpbmdD YXNlKHNvdXJjZSwgImRvY3R5cGUiKTsKQEAgLTEwODUsNiArMTA4NCw3IEBAIGJvb2wgSFRNTFRv a2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFMKICAgICAgICAgICAgIH0gZWxzZSBpZiAocmVz dWx0ID09IFNlZ21lbnRlZFN0cmluZzo6Tm90RW5vdWdoQ2hhcmFjdGVycykKICAgICAgICAgICAg ICAgICByZXR1cm4gaGF2ZUJ1ZmZlcmVkQ2hhcmFjdGVyVG9rZW4oKTsKICAgICAgICAgfSBlbHNl IGlmIChjYyA9PSAnWycgJiYgc2hvdWxkQWxsb3dDREFUQSgpKSB7CisgICAgICAgICAgICBTdHJp bmcgY2RhdGFTdHJpbmcoIltDREFUQVsiLCBTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsK ICAgICAgICAgICAgIFNlZ21lbnRlZFN0cmluZzo6TG9va0FoZWFkUmVzdWx0IHJlc3VsdCA9IHNv dXJjZS5sb29rQWhlYWQoY2RhdGFTdHJpbmcpOwogICAgICAgICAgICAgaWYgKHJlc3VsdCA9PSBT ZWdtZW50ZWRTdHJpbmc6OkRpZE1hdGNoKSB7CiAgICAgICAgICAgICAgICAgYWR2YW5jZVN0cmlu Z0FuZEFTU0VSVChzb3VyY2UsICJbQ0RBVEFbIik7CkBAIC0xMjY4LDkgKzEyNjgsOCBAQCBib29s IEhUTUxUb2tlbml6ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTCiAgICAgICAgICAgICBtX3Rva2Vu LT5zZXRGb3JjZVF1aXJrcygpOwogICAgICAgICAgICAgcmV0dXJuIGVtaXRBbmRSZWNvbnN1bWVJ bihzb3VyY2UsIEhUTUxUb2tlbml6ZXJTdGF0ZTo6RGF0YVN0YXRlKTsKICAgICAgICAgfSBlbHNl IHsKLSAgICAgICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBwdWJsaWNTdHJpbmcs ICgicHVibGljIikpOwotICAgICAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIHN5 c3RlbVN0cmluZywgKCJzeXN0ZW0iKSk7CiAgICAgICAgICAgICBpZiAoY2MgPT0gJ1AnIHx8IGNj ID09ICdwJykgeworICAgICAgICAgICAgICAgIFN0cmluZyBwdWJsaWNTdHJpbmcoInB1YmxpYyIs IFN0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpOwogICAgICAgICAgICAgICAgIFNlZ21lbnRl ZFN0cmluZzo6TG9va0FoZWFkUmVzdWx0IHJlc3VsdCA9IHNvdXJjZS5sb29rQWhlYWRJZ25vcmlu Z0Nhc2UocHVibGljU3RyaW5nKTsKICAgICAgICAgICAgICAgICBpZiAocmVzdWx0ID09IFNlZ21l bnRlZFN0cmluZzo6RGlkTWF0Y2gpIHsKICAgICAgICAgICAgICAgICAgICAgYWR2YW5jZVN0cmlu Z0FuZEFTU0VSVElnbm9yaW5nQ2FzZShzb3VyY2UsICJwdWJsaWMiKTsKQEAgLTEyNzgsNiArMTI3 Nyw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFMKICAgICAgICAg ICAgICAgICB9IGVsc2UgaWYgKHJlc3VsdCA9PSBTZWdtZW50ZWRTdHJpbmc6Ok5vdEVub3VnaENo YXJhY3RlcnMpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBoYXZlQnVmZmVyZWRDaGFyYWN0 ZXJUb2tlbigpOwogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnUycgfHwgY2MgPT0gJ3Mn KSB7CisgICAgICAgICAgICAgICAgU3RyaW5nIHN5c3RlbVN0cmluZygic3lzdGVtIiwgU3RyaW5n OjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7CiAgICAgICAgICAgICAgICAgU2VnbWVudGVkU3RyaW5n OjpMb29rQWhlYWRSZXN1bHQgcmVzdWx0ID0gc291cmNlLmxvb2tBaGVhZElnbm9yaW5nQ2FzZShz eXN0ZW1TdHJpbmcpOwogICAgICAgICAgICAgICAgIGlmIChyZXN1bHQgPT0gU2VnbWVudGVkU3Ry aW5nOjpEaWRNYXRjaCkgewogICAgICAgICAgICAgICAgICAgICBhZHZhbmNlU3RyaW5nQW5kQVNT RVJUSWdub3JpbmdDYXNlKHNvdXJjZSwgInN5c3RlbSIpOwo= 161112 2012-08-28 18:39:07 -0700 2012-09-07 11:32:33 -0700 Patch bug-95276-20120828183857.patch text/plain 2598 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc3NTNlNGZkM2VjNjFk ZGVmYWIyZjZmNjQ3MjQzMzgyODdiMThiZS4uY2YwY2I4ZTJlN2NkNzM5NTA0OWQyMDc3OTJjY2Ez NjkyMWNkMzAyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTI4ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSFRNTFRva2VuaXplciBzaG91 bGQgdXNlIHRoZSBsYXRlc3QgRWZmaWNpZW50U3RyaW5ncyBob3RuZXNzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTI3NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIEFTQ0lJTGl0ZXJhbCBhdm9p ZHMgbWVtY3B5aW5nIHRoZSBzdHJpbmcgaW50byB0aGUgaGVhcCBhbmQKKyAgICAgICAgdGhlcmVm b3JlIHVzZXMgbGVzcyB0b3RhbCBtZW1vcnkuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1M VG9rZW5pemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6Om5leHRUb2tl bik6CisKIDIwMTItMDgtMjggIFRvbSBTZXBleiAgPHRzZXBlekBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgQ1NQIGRvZXNuJ3QgdHVybiBvZmYgZXZhbCwgZXRjLiBpbiBXZWIgV29ya2VycwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmNwcAppbmRleCBjYTVkNWIw NjQ4NGRjMjNlMWNjN2EwYzc2NGZmMWY0ZDQ1NzllMDUxLi5iMjU4ODVmNjQ4MGMzNzZjZGVmNWVi ZDFhMzRmZWYzZWU0MmNmODBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNl ci9IVE1MVG9rZW5pemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1M VG9rZW5pemVyLmNwcApAQCAtMTA2NSw5ICsxMDY1LDkgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpu ZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUxUb2tlbiYgdG9rZW4pCiAgICAg RU5EX1NUQVRFKCkKIAogICAgIEhUTUxfQkVHSU5fU1RBVEUoTWFya3VwRGVjbGFyYXRpb25PcGVu U3RhdGUpIHsKLSAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGRhc2hEYXNoU3Ry aW5nLCAoIi0tIikpOwotICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgZG9jdHlw ZVN0cmluZywgKCJkb2N0eXBlIikpOwotICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmlu ZywgY2RhdGFTdHJpbmcsICgiW0NEQVRBWyIpKTsKKyAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NB TChTdHJpbmcsIGRhc2hEYXNoU3RyaW5nLCAoQVNDSUlMaXRlcmFsKCItLSIpKSk7CisgICAgICAg IERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBkb2N0eXBlU3RyaW5nLCAoQVNDSUlMaXRlcmFs KCJkb2N0eXBlIikpKTsKKyAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNkYXRh U3RyaW5nLCAoQVNDSUlMaXRlcmFsKCJbQ0RBVEFbIikpKTsKICAgICAgICAgaWYgKGNjID09ICct JykgewogICAgICAgICAgICAgU2VnbWVudGVkU3RyaW5nOjpMb29rQWhlYWRSZXN1bHQgcmVzdWx0 ID0gc291cmNlLmxvb2tBaGVhZChkYXNoRGFzaFN0cmluZyk7CiAgICAgICAgICAgICBpZiAocmVz dWx0ID09IFNlZ21lbnRlZFN0cmluZzo6RGlkTWF0Y2gpIHsKQEAgLTEyNjgsOCArMTI2OCw4IEBA IGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBI VE1MVG9rZW4mIHRva2VuKQogICAgICAgICAgICAgbV90b2tlbi0+c2V0Rm9yY2VRdWlya3MoKTsK ICAgICAgICAgICAgIHJldHVybiBlbWl0QW5kUmVjb25zdW1lSW4oc291cmNlLCBIVE1MVG9rZW5p emVyU3RhdGU6OkRhdGFTdGF0ZSk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKFN0cmluZywgcHVibGljU3RyaW5nLCAoInB1YmxpYyIpKTsKLSAgICAg ICAgICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBzeXN0ZW1TdHJpbmcsICgic3lzdGVt IikpOworICAgICAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIHB1YmxpY1N0cmlu ZywgKEFTQ0lJTGl0ZXJhbCgicHVibGljIikpKTsKKyAgICAgICAgICAgIERFRklORV9TVEFUSUNf TE9DQUwoU3RyaW5nLCBzeXN0ZW1TdHJpbmcsIChBU0NJSUxpdGVyYWwoInN5c3RlbSIpKSk7CiAg ICAgICAgICAgICBpZiAoY2MgPT0gJ1AnIHx8IGNjID09ICdwJykgewogICAgICAgICAgICAgICAg IFNlZ21lbnRlZFN0cmluZzo6TG9va0FoZWFkUmVzdWx0IHJlc3VsdCA9IHNvdXJjZS5sb29rQWhl YWRJZ25vcmluZ0Nhc2UocHVibGljU3RyaW5nKTsKICAgICAgICAgICAgICAgICBpZiAocmVzdWx0 ID09IFNlZ21lbnRlZFN0cmluZzo6RGlkTWF0Y2gpIHsK