ChangeLog

2011-12-02  Andreas Kling  <kling@webkit.org>

        StyledElement: Simplify addCSSColor().

        <http://webkit.org/b/73703>

        Reviewed by NOBODY (OOPS!).

        The Color(const String&) constructor handles both named and 3/6-digit

        hex colors, so there's no need to handle those separately here.

        Also tweaked some comments and minor things.

        * dom/StyledElement.cpp:

        (WebCore::StyledElement::addCSSColor):

2011-12-02  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r101805.

Source/WebCore/dom/StyledElement.cpp

@@static String parseColorStringWithCrazyLegacyRules(const String& colorString)

// Color parsing that matches HTML's "rules for parsing a legacy color value"

void StyledElement::addCSSColor(Attribute* attribute, int id, const String& attributeValue)

{

374 // ~~The~~ empty string doesn't apply a color. (~~Just~~ whitespace does, which is why this check occurs before trimming.)

375 if (!attributeValue.~~leng~~th())

374 // An empty string doesn't apply a color. (Only whitespace does, which is why this check occurs before trimming.)

375 if (attributeValue.isEmpty())

376376 return;

377377

378 String color = attributeValue.stripWhiteSpace();

378 String colorString = attributeValue.stripWhiteSpace();

379379

380380 // "transparent" doesn't apply a color either.

381 if (equalIgnoringCase(color, "transparent"))

381 if (equalIgnoringCase(colorString, "transparent"))

        return;

    if (!attribute->decl())

        createMappedDecl(attribute);

    // If the string is a named CSS color, use that color.

    Color foundColor;

    foundColor.setNamedColor(color);

    if (foundColor.isValid()) {

        attribute->decl()->setProperty(id, color, false);

    // If the string is a named CSS color or a 3/6-digit hex color, use that.

    Color color(colorString);

    if (color.isValid()) {

        attribute->decl()->setProperty(id, colorString, false);

        return;

    }

    // If the string is a 3 or 6-digit hex color, use that color.

    if (color[0] == '#' && (color.length() == 4 || color.length() == 7) && attribute->decl()->setProperty(id, color, false))

        return;

    attribute->decl()->setProperty(id, parseColorStringWithCrazyLegacyRules(color), false);

394 attribute->decl()->setProperty(id, parseColorStringWithCrazyLegacyRules(colorString), false);

}

void StyledElement::createMappedDecl(Attribute* attr)