Split out Color from CSSPrimitiveValue

third_party/WebKit/Source/core/css/parser/CSSParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/CSSParser.h"
 
+#include "core/css/CSSColorValue.h"
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/StyleColor.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/parser/CSSParserFastPaths.h"
 #include "core/css/parser/CSSParserImpl.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/CSSSelectorParser.h"
 #include "core/css/parser/CSSSupportsParser.h"
@@ skipping 101 matching lines @@
     if (namedColor.setNamedColor(string)) {
         color = namedColor.rgb();
         return true;
     }
 
     RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, strict ? HTMLStandardMode : HTMLQuirksMode);
     // TODO(timloh): Why is this always strict mode?
     if (!value)
         value = parseSingleValue(CSSPropertyColor, string, strictCSSParserContext());
 
-    if (!value || !value->isPrimitiveValue())
+    if (!value || !value->isColorValue())
         return false;
-
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());
-    if (!primitiveValue->isRGBColor())
-        return false;
-
-    color = primitiveValue->getRGBA32Value();
+    color = toCSSColorValue(*value).value();
     return true;
 }
 
 bool CSSParser::parseSystemColor(RGBA32& color, const String& colorString)
 {
     CSSParserString cssColor;
     cssColor.init(colorString);
     CSSValueID id = cssValueKeywordID(cssColor);
     if (!CSSPropertyParser::isSystemColor(id))
         return false;
@@ skipping 11 matching lines @@
     builder.appendLiteral(" : ");
     builder.append(propertyValue);
     builder.appendLiteral("; }");
     RefPtrWillBeRawPtr<StyleRuleBase> rule = parseRule(context, nullptr, builder.toString());
     if (!rule || !rule->isFontFaceRule())
         return nullptr;
     return toStyleRuleFontFace(rule.get())->properties().getPropertyCSSValue(propertyID);
 }
 
 } // namespace blink