107368 2013-01-19 02:56:36 -0800 Add a helper function for getting strings from tokens (and make it 8-bit aware) 2013-02-13 21:35:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WORKSFORME P2 Normal --- 106127 1 eric eric abarth benjamin ojan.autocc tonyg webkit.review.bot oldest_to_newest 811364 0 eric 2013-01-19 02:56:36 -0800 Add a helper function for getting strings from tokens (and make it 8-bit aware) 811365 1 183614 eric 2013-01-19 02:58:01 -0800 Created attachment 183614 Patch 811431 2 183614 abarth 2013-01-19 11:10:14 -0800 Comment on attachment 183614 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183614&action=review > Source/WebCore/html/parser/CompactHTMLToken.cpp:40 > + if (!vector.size()) > + return emptyString(); There's no reason to do this. Both String::make8BitFrom16BitSource and String have special-case logic for the empty string. > Source/WebCore/html/parser/CompactHTMLToken.cpp:41 > + if (token.isAll8BitData()) This isn't correct for anything other than m_data. We only track this flag for the main data vector. Perhaps we should make HTMLToken smarter and track this flag for the other strings as well? 832714 3 abarth 2013-02-13 21:35:01 -0800 Eric did this in a more general way. 183614 2013-01-19 02:58:01 -0800 2013-01-19 11:10:14 -0800 Patch bug-107368-20130119025500.patch text/plain 3605 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2MxMWM2MTZkYjVmNjU2 NmEwZjkxMTgwOWJmNjY3NjRmYWYyZmJlZC4uNjZhZDNhMzVmNjg2MmJiNjU1MjY0NjhmZTY3NjRh ZGVjZWQ3MDE4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAxLTE5ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgYSBoZWxwZXIgZnVuY3Rp b24gZm9yIGdldHRpbmcgc3RyaW5ncyBmcm9tIHRva2VucyAoYW5kIG1ha2UgaXQgOC1iaXQgYXdh cmUpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcz NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBj YW4gc3RpbGwgZG8gbXVjaCBiZXR0ZXIgdGhhbiB0aGlzLCBidXQgdGhpcyBhdCBsZWFzdCBzaW1w bGlmaWVzIHRoZSBjb2RlLgorICAgICAgICBUaGlzIHNob3VsZCBtYWtlIDgtYml0IHNvdXJjZSBw YXJzaW5nIGZhc3RlciwgdW5mb3J0dW5hdGVseSBvdXIKKyAgICAgICAgaHRtbC1wYXJzZXIgYmVu Y2htYXJrcyBhbGwgdXNlIGEgamF2YXNjcmlwdCBzdHJpbmcgdG8gZmVlZCB0aGUgcGFyc2VyCisg ICAgICAgIGFuZCB0aHVzIHVzZSAxNi1iaXQgc3RyaW5nIGRhdGEuCisKKyAgICAgICAgKiBodG1s L3BhcnNlci9Db21wYWN0SFRNTFRva2VuLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAoV2ViQ29yZTo6c3RyaW5nRnJvbVRva2VuKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBhY3RI VE1MVG9rZW46OkNvbXBhY3RIVE1MVG9rZW4pOgorCiAyMDEzLTAxLTE5ICBaYW4gRG9iZXJzZWsg IDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIEdUSyBidWlsZCBm aXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9Db21wYWN0SFRNTFRv a2VuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0NvbXBhY3RIVE1MVG9rZW4uY3Bw CmluZGV4IDA5MzI4ZWU4NjBkZjQzMzM1NWRiYjMyNjVmM2U3ZTEyNjBhNmQzNWEuLjZlMDQ3OThm YzkyZDlhMWUxMjM4MzhhOGFkODg0NjUwMzkzYTlhODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0NvbXBhY3RIVE1MVG9rZW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0NvbXBhY3RIVE1MVG9rZW4uY3BwCkBAIC0zMyw2ICszMywxNiBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKKy8vIEZJWE1FOiBUaGlzIHByb2JhYmx5IGJlbG9uZ3Mgb24g VG9rZW4/CitzdGF0aWMgU3RyaW5nIHN0cmluZ0Zyb21Ub2tlbihjb25zdCBIVE1MVG9rZW4mIHRv a2VuLCBjb25zdCBIVE1MVG9rZW46OkRhdGFWZWN0b3ImIHZlY3RvcikKK3sKKyAgICBpZiAoIXZl Y3Rvci5zaXplKCkpCisgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOworICAgIGlmICh0b2tl bi5pc0FsbDhCaXREYXRhKCkpCisgICAgICAgIHJldHVybiBTdHJpbmc6Om1ha2U4Qml0RnJvbTE2 Qml0U291cmNlKHZlY3Rvci5kYXRhKCksIHZlY3Rvci5zaXplKCkpOworICAgIHJldHVybiBTdHJp bmcodmVjdG9yLmRhdGEoKSwgdmVjdG9yLnNpemUoKSk7Cit9CisKIENvbXBhY3RIVE1MVG9rZW46 OkNvbXBhY3RIVE1MVG9rZW4oY29uc3QgSFRNTFRva2VuJiB0b2tlbikKICAgICA6IG1fdHlwZSh0 b2tlbi50eXBlKCkpCiB7CkBAIC00MSwyNiArNTEsMjMgQEAgQ29tcGFjdEhUTUxUb2tlbjo6Q29t cGFjdEhUTUxUb2tlbihjb25zdCBIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBIVE1MVG9rZW5UeXBlczo6RE9D VFlQRToKLSAgICAgICAgbV9kYXRhID0gU3RyaW5nKHRva2VuLm5hbWUoKS5kYXRhKCksIHRva2Vu Lm5hbWUoKS5zaXplKCkpOwotICAgICAgICBtX3B1YmxpY0lkZW50aWZpZXIgPSBTdHJpbmcodG9r ZW4ucHVibGljSWRlbnRpZmllcigpLmRhdGEoKSwgdG9rZW4ucHVibGljSWRlbnRpZmllcigpLnNp emUoKSk7Ci0gICAgICAgIG1fc3lzdGVtSWRlbnRpZmllciA9IFN0cmluZyh0b2tlbi5zeXN0ZW1J ZGVudGlmaWVyKCkuZGF0YSgpLCB0b2tlbi5zeXN0ZW1JZGVudGlmaWVyKCkuc2l6ZSgpKTsKKyAg ICAgICAgbV9kYXRhID0gc3RyaW5nRnJvbVRva2VuKHRva2VuLCB0b2tlbi5uYW1lKCkpOworICAg ICAgICBtX3B1YmxpY0lkZW50aWZpZXIgPSBzdHJpbmdGcm9tVG9rZW4odG9rZW4sIHRva2VuLnB1 YmxpY0lkZW50aWZpZXIoKSk7CisgICAgICAgIG1fc3lzdGVtSWRlbnRpZmllciA9IHN0cmluZ0Zy b21Ub2tlbih0b2tlbiwgdG9rZW4uc3lzdGVtSWRlbnRpZmllcigpKTsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBIVE1MVG9rZW5UeXBlczo6RW5kT2ZGaWxlOgogICAgICAgICBicmVhazsKICAg ICBjYXNlIEhUTUxUb2tlblR5cGVzOjpTdGFydFRhZzoKICAgICAgICAgbV9hdHRyaWJ1dGVzLnJl c2VydmVJbml0aWFsQ2FwYWNpdHkodG9rZW4uYXR0cmlidXRlcygpLnNpemUoKSk7CiAgICAgICAg IGZvciAoVmVjdG9yPEF0dHJpYnV0ZUJhc2U+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHRva2VuLmF0 dHJpYnV0ZXMoKS5iZWdpbigpOyBpdCAhPSB0b2tlbi5hdHRyaWJ1dGVzKCkuZW5kKCk7ICsraXQp Ci0gICAgICAgICAgICBtX2F0dHJpYnV0ZXMuYXBwZW5kKENvbXBhY3RBdHRyaWJ1dGUoU3RyaW5n KGl0LT5tX25hbWUuZGF0YSgpLCBpdC0+bV9uYW1lLnNpemUoKSksIFN0cmluZyhpdC0+bV92YWx1 ZS5kYXRhKCksIGl0LT5tX3ZhbHVlLnNpemUoKSkpKTsKKyAgICAgICAgICAgIG1fYXR0cmlidXRl cy5hcHBlbmQoQ29tcGFjdEF0dHJpYnV0ZShzdHJpbmdGcm9tVG9rZW4odG9rZW4sIGl0LT5tX25h bWUpLCBzdHJpbmdGcm9tVG9rZW4odG9rZW4sIGl0LT5tX3ZhbHVlKSkpOwogICAgICAgICAvLyBG YWxsIHRocm91Z2ghCiAgICAgY2FzZSBIVE1MVG9rZW5UeXBlczo6RW5kVGFnOgogICAgICAgICBt X3NlbGZDbG9zaW5nID0gdG9rZW4uc2VsZkNsb3NpbmcoKTsKICAgICAgICAgLy8gRmFsbCB0aHJv dWdoIQogICAgIGNhc2UgSFRNTFRva2VuVHlwZXM6OkNvbW1lbnQ6CiAgICAgY2FzZSBIVE1MVG9r ZW5UeXBlczo6Q2hhcmFjdGVyOgotICAgICAgICBpZiAodG9rZW4uaXNBbGw4Qml0RGF0YSgpKQot ICAgICAgICAgICAgbV9kYXRhID0gU3RyaW5nOjptYWtlOEJpdEZyb20xNkJpdFNvdXJjZSh0b2tl bi5kYXRhKCkuZGF0YSgpLCB0b2tlbi5kYXRhKCkuc2l6ZSgpKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgbV9kYXRhID0gU3RyaW5nKHRva2VuLmRhdGEoKS5kYXRhKCksIHRva2VuLmRhdGEo KS5zaXplKCkpOworICAgICAgICBtX2RhdGEgPSBzdHJpbmdGcm9tVG9rZW4odG9rZW4sIHRva2Vu LmRhdGEoKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwo=