73703 2011-12-02 14:18:00 -0800 StyledElement: Simplify addCSSColor(). 2011-12-02 15:48:55 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling oldest_to_newest 514140 0 kling 2011-12-02 14:18:00 -0800 StyledElement: Simplify addCSSColor(). 514142 1 117689 kling 2011-12-02 14:19:06 -0800 Created attachment 117689 Patch 514160 2 117689 darin 2011-12-02 14:32:01 -0800 Comment on attachment 117689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117689&action=review > Source/WebCore/dom/StyledElement.cpp:374 > + // An empty string doesn't apply a color. (Only whitespace does, which is why this check occurs before trimming.) This wording (and the old wording) is terribly confusing. The phrase “only whitespace applies a color” is not what we mean here. What we mean is “A string containing only whitespace applies a color”. So we need to word it that way: “A string containing only”, “One containing only”, “A string with only”, or “One with only”. The term “trimming” is confusing, since the function called below is stripWhiteSpace, and does not use the word “trim”. > Source/WebCore/dom/StyledElement.cpp:388 > + Color color(colorString); I think I’d call this local variable parsedColor. 514242 3 kling 2011-12-02 15:48:55 -0800 Committed r101870: <http://trac.webkit.org/changeset/101870> 117689 2011-12-02 14:19:06 -0800 2011-12-02 14:35:31 -0800 Patch bug-73703.diff text/plain 2821 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0N2MxMjg5Li45YThjNTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMTItMDIgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAg ICAgIFN0eWxlZEVsZW1lbnQ6IFNpbXBsaWZ5IGFkZENTU0NvbG9yKCkuCisgICAgICAgIDxodHRw Oi8vd2Via2l0Lm9yZy9iLzczNzAzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBDb2xvcihjb25zdCBTdHJpbmcmKSBjb25zdHJ1Y3RvciBoYW5k bGVzIGJvdGggbmFtZWQgYW5kIDMvNi1kaWdpdAorICAgICAgICBoZXggY29sb3JzLCBzbyB0aGVy ZSdzIG5vIG5lZWQgdG8gaGFuZGxlIHRob3NlIHNlcGFyYXRlbHkgaGVyZS4KKyAgICAgICAgQWxz byB0d2Vha2VkIHNvbWUgY29tbWVudHMgYW5kIG1pbm9yIHRoaW5ncy4KKworICAgICAgICAqIGRv bS9TdHlsZWRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZEVsZW1lbnQ6OmFk ZENTU0NvbG9yKToKKwogMjAxMS0xMi0wMiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJv dEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEwMTgwNS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAppbmRleCA0Mjk4MGQyLi42ZjIwZTBjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3BwCkBAIC0zNzEsMzIgKzM3MSwyNyBAQCBz dGF0aWMgU3RyaW5nIHBhcnNlQ29sb3JTdHJpbmdXaXRoQ3JhenlMZWdhY3lSdWxlcyhjb25zdCBT dHJpbmcmIGNvbG9yU3RyaW5nKQogLy8gQ29sb3IgcGFyc2luZyB0aGF0IG1hdGNoZXMgSFRNTCdz ICJydWxlcyBmb3IgcGFyc2luZyBhIGxlZ2FjeSBjb2xvciB2YWx1ZSIKIHZvaWQgU3R5bGVkRWxl bWVudDo6YWRkQ1NTQ29sb3IoQXR0cmlidXRlKiBhdHRyaWJ1dGUsIGludCBpZCwgY29uc3QgU3Ry aW5nJiBhdHRyaWJ1dGVWYWx1ZSkKIHsKLSAgICAvLyBUaGUgZW1wdHkgc3RyaW5nIGRvZXNuJ3Qg YXBwbHkgYSBjb2xvci4gKEp1c3Qgd2hpdGVzcGFjZSBkb2VzLCB3aGljaCBpcyB3aHkgdGhpcyBj aGVjayBvY2N1cnMgYmVmb3JlIHRyaW1taW5nLikKLSAgICBpZiAoIWF0dHJpYnV0ZVZhbHVlLmxl bmd0aCgpKQorICAgIC8vIEFuIGVtcHR5IHN0cmluZyBkb2Vzbid0IGFwcGx5IGEgY29sb3IuIChP bmx5IHdoaXRlc3BhY2UgZG9lcywgd2hpY2ggaXMgd2h5IHRoaXMgY2hlY2sgb2NjdXJzIGJlZm9y ZSB0cmltbWluZy4pCisgICAgaWYgKGF0dHJpYnV0ZVZhbHVlLmlzRW1wdHkoKSkKICAgICAgICAg cmV0dXJuOwogICAgIAotICAgIFN0cmluZyBjb2xvciA9IGF0dHJpYnV0ZVZhbHVlLnN0cmlwV2hp dGVTcGFjZSgpOworICAgIFN0cmluZyBjb2xvclN0cmluZyA9IGF0dHJpYnV0ZVZhbHVlLnN0cmlw V2hpdGVTcGFjZSgpOwogCiAgICAgLy8gInRyYW5zcGFyZW50IiBkb2Vzbid0IGFwcGx5IGEgY29s b3IgZWl0aGVyLgotICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShjb2xvciwgInRyYW5zcGFyZW50 IikpCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGNvbG9yU3RyaW5nLCAidHJhbnNwYXJlbnQi KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFhdHRyaWJ1dGUtPmRlY2woKSkKICAgICAg ICAgY3JlYXRlTWFwcGVkRGVjbChhdHRyaWJ1dGUpOwogCi0gICAgLy8gSWYgdGhlIHN0cmluZyBp cyBhIG5hbWVkIENTUyBjb2xvciwgdXNlIHRoYXQgY29sb3IuCi0gICAgQ29sb3IgZm91bmRDb2xv cjsKLSAgICBmb3VuZENvbG9yLnNldE5hbWVkQ29sb3IoY29sb3IpOwotICAgIGlmIChmb3VuZENv bG9yLmlzVmFsaWQoKSkgewotICAgICAgICBhdHRyaWJ1dGUtPmRlY2woKS0+c2V0UHJvcGVydHko aWQsIGNvbG9yLCBmYWxzZSk7CisgICAgLy8gSWYgdGhlIHN0cmluZyBpcyBhIG5hbWVkIENTUyBj b2xvciBvciBhIDMvNi1kaWdpdCBoZXggY29sb3IsIHVzZSB0aGF0LgorICAgIENvbG9yIGNvbG9y KGNvbG9yU3RyaW5nKTsKKyAgICBpZiAoY29sb3IuaXNWYWxpZCgpKSB7CisgICAgICAgIGF0dHJp YnV0ZS0+ZGVjbCgpLT5zZXRQcm9wZXJ0eShpZCwgY29sb3JTdHJpbmcsIGZhbHNlKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAotICAgIC8vIElmIHRoZSBzdHJpbmcgaXMgYSAzIG9yIDYtZGln aXQgaGV4IGNvbG9yLCB1c2UgdGhhdCBjb2xvci4KLSAgICBpZiAoY29sb3JbMF0gPT0gJyMnICYm IChjb2xvci5sZW5ndGgoKSA9PSA0IHx8IGNvbG9yLmxlbmd0aCgpID09IDcpICYmIGF0dHJpYnV0 ZS0+ZGVjbCgpLT5zZXRQcm9wZXJ0eShpZCwgY29sb3IsIGZhbHNlKSkKLSAgICAgICAgcmV0dXJu OwotCi0gICAgYXR0cmlidXRlLT5kZWNsKCktPnNldFByb3BlcnR5KGlkLCBwYXJzZUNvbG9yU3Ry aW5nV2l0aENyYXp5TGVnYWN5UnVsZXMoY29sb3IpLCBmYWxzZSk7CisgICAgYXR0cmlidXRlLT5k ZWNsKCktPnNldFByb3BlcnR5KGlkLCBwYXJzZUNvbG9yU3RyaW5nV2l0aENyYXp5TGVnYWN5UnVs ZXMoY29sb3JTdHJpbmcpLCBmYWxzZSk7CiB9CiAKIHZvaWQgU3R5bGVkRWxlbWVudDo6Y3JlYXRl TWFwcGVkRGVjbChBdHRyaWJ1dGUqIGF0dHIpCg==