CSS Parser : Move parseSystemColor implementation out of BisonCSSParser

The implementation doesn't depend on Bison, it is common to both CSS parser implementations. BUG=330389 Review URL: https://codereview.chromium.org/839453007 git-svn-id: svn://svn.chromium.org/blink/trunk@188290 bbb929c8-8fbe-4397-9dbb-9b2b20218538
shaoboyan · Jan 13, 2015 · 9a371a0 · 9a371a0
1 parent da6813b
commit 9a371a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp b/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp
@@ -77,7 +77,6 @@
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
-#include "core/rendering/RenderTheme.h"
 #include "platform/FloatConversion.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/BitArray.h"
@@ -232,19 +231,6 @@ bool BisonCSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropert
     return ok;
 }
 
-bool BisonCSSParser::parseSystemColor(RGBA32& color, const String& string)
-{
-    CSSParserString cssColor;
-    cssColor.init(string);
-    CSSValueID id = cssValueKeywordID(cssColor);
-    if (!CSSPropertyParser::isSystemColor(id))
-        return false;
-
-    Color parsedColor = RenderTheme::theme().systemColor(id);
-    color = parsedColor.rgb();
-    return true;
-}
-
 void BisonCSSParser::parseSelector(const String& string, CSSSelectorList& selectorList)
 {
     m_selectorListForParseSelector = &selectorList;

diff --git a/third_party/WebKit/Source/core/css/parser/BisonCSSParser.h b/third_party/WebKit/Source/core/css/parser/BisonCSSParser.h
@@ -82,7 +82,6 @@ class BisonCSSParser {
     PassRefPtrWillBeRawPtr<StyleRuleKeyframe> parseKeyframeRule(StyleSheetContents*, const String&);
     bool parseSupportsCondition(const String&);
     static bool parseValue(MutableStylePropertySet*, CSSPropertyID, const String&, bool important, const CSSParserContext&);
-    static bool parseSystemColor(RGBA32& color, const String&);
     bool parseDeclaration(MutableStylePropertySet*, const String&, CSSParserObserver*, StyleSheetContents* contextStyleSheet);
     static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> parseInlineStyleDeclaration(const String&, Element*);
     PassOwnPtr<Vector<double> > parseKeyframeKeyList(const String&);

diff --git a/third_party/WebKit/Source/core/css/parser/CSSParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSParser.cpp
@@ -13,6 +13,7 @@
 #include "core/css/parser/CSSParserImpl.h"
 #include "core/css/parser/CSSSelectorParser.h"
 #include "core/css/parser/CSSTokenizer.h"
+#include "core/rendering/RenderTheme.h"
 
 namespace blink {
 
@@ -162,7 +163,15 @@ StyleColor CSSParser::colorFromRGBColorString(const String& string)
 
 bool CSSParser::parseSystemColor(RGBA32& color, const String& colorString)
 {
-    return BisonCSSParser::parseSystemColor(color, colorString);
+    CSSParserString cssColor;
+    cssColor.init(colorString);
+    CSSValueID id = cssValueKeywordID(cssColor);
+    if (!CSSPropertyParser::isSystemColor(id))
+        return false;
+
+    Color parsedColor = RenderTheme::theme().systemColor(id);
+    color = parsedColor.rgb();
+    return true;
 }
 
 } // namespace blink