Changeset 207539 in webkit

Timestamp:

Oct 19, 2016 9:38:42 AM (8 years ago)

Author:

hyatt@apple.com

Message:

[CSS Parser] Fix named color parsing
​https://bugs.webkit.org/show_bug.cgi?id=163662

Reviewed by Zalan Bujtas.

Named color parsing in the old parser for extended colors relied on constructing a Color with the
name and doing a lookup that way.

The new parser allows the back end to hold a primitive identifier value for extended colors.

StyleColor contains a helper function for looking up the correct color.

This patch switches both the old and the new parsers over to the new StyleColor function.

Also remove some asserts from the CSSSelectorList, since the new parser allows it to be empty and
detects parsing failure that way.

• css/CSSSelectorList.cpp:

(WebCore::CSSSelectorList::CSSSelectorList):
(WebCore::CSSSelectorList::operator=):

• css/StyleColor.cpp:

(WebCore::StyleColor::isColorKeyword):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::colorFromPrimitiveValue):
(WebCore::colorForCSSValue): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSSelectorList.cpp (modified) (2 diffs)
• css/StyleColor.cpp (modified) (1 diff)
• css/StyleResolver.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-19  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Fix named color parsing
+        https://bugs.webkit.org/show_bug.cgi?id=163662
+
+        Reviewed by Zalan Bujtas.
+
+        Named color parsing in the old parser for extended colors relied on constructing a Color with the
+        name and doing a lookup that way.
+
+        The new parser allows the back end to hold a primitive identifier value for extended colors.
+
+        StyleColor contains a helper function for looking up the correct color.
+
+        This patch switches both the old and the new parsers over to the new StyleColor function.
+
+        Also remove some asserts from the CSSSelectorList, since the new parser allows it to be empty and
+        detects parsing failure that way.
+
+        * css/CSSSelectorList.cpp:
+        (WebCore::CSSSelectorList::CSSSelectorList):
+        (WebCore::CSSSelectorList::operator=):
+        * css/StyleColor.cpp:
+        (WebCore::StyleColor::isColorKeyword):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::colorFromPrimitiveValue):
+        (WebCore::colorForCSSValue): Deleted.
+
 2016-10-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/css/CSSSelectorList.cpp

@@ -46 +46 @@
     : m_selectorArray(other.m_selectorArray)
 {
-    ASSERT_WITH_SECURITY_IMPLICATION(componentCount());
     other.m_selectorArray = nullptr;
 }
@@ -103 +102 @@
     other.m_selectorArray = nullptr;
 
-    ASSERT_WITH_SECURITY_IMPLICATION(componentCount());
     return *this;
 }

trunk/Source/WebCore/css/StyleColor.cpp

@@ -49 +49 @@
 bool StyleColor::isColorKeyword(CSSValueID id)
 {
-    return (id >= CSSValueAlpha && id <= CSSValueWebkitText) || id == CSSValueMenu;
+    return (id >= CSSValueAlpha && id <= CSSValueWebkitText)
+        || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen)
+        || id == CSSValueMenu;
 }
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -121 +121 @@
 #include "ShadowRoot.h"
 #include "StyleBuilder.h"
+#include "StyleColor.h"
 #include "StyleCachedImage.h"
 #include "StyleFontSizeFunctions.h"
@@ -1778 +1779 @@
 }
 
-static Color colorForCSSValue(CSSValueID cssValueId)
-{
-    struct ColorValue {
-        CSSValueID cssValueId;
-        RGBA32 color;
-    };
-
-    static const ColorValue colorValues[] = {
-        { CSSValueAqua, 0xFF00FFFF },
-        { CSSValueBlack, 0xFF000000 },
-        { CSSValueBlue, 0xFF0000FF },
-        { CSSValueFuchsia, 0xFFFF00FF },
-        { CSSValueGray, 0xFF808080 },
-        { CSSValueGreen, 0xFF008000  },
-        { CSSValueGrey, 0xFF808080 },
-        { CSSValueLime, 0xFF00FF00 },
-        { CSSValueMaroon, 0xFF800000 },
-        { CSSValueNavy, 0xFF000080 },
-        { CSSValueOlive, 0xFF808000  },
-        { CSSValueOrange, 0xFFFFA500 },
-        { CSSValuePurple, 0xFF800080 },
-        { CSSValueRed, 0xFFFF0000 },
-        { CSSValueSilver, 0xFFC0C0C0 },
-        { CSSValueTeal, 0xFF008080  },
-        { CSSValueTransparent, 0x00000000 },
-        { CSSValueWhite, 0xFFFFFFFF },
-        { CSSValueYellow, 0xFFFFFF00 },
-        { CSSValueInvalid, CSSValueInvalid }
-    };
-
-    for (const ColorValue* col = colorValues; col->cssValueId; ++col) {
-        if (col->cssValueId == cssValueId)
-            return col->color;
-    }
-    return RenderTheme::defaultTheme()->systemColor(cssValueId);
-}
-
 bool StyleResolver::colorFromPrimitiveValueIsDerivedFromElement(const CSSPrimitiveValue& value)
 {
@@ -1849 +1813 @@
     case CSSValueCurrentcolor:
         return state.style()->color();
-    default:
-        return colorForCSSValue(ident);
+    default: {
+        return StyleColor::colorFromKeyword(ident);
+    }
     }
 }