Changed CSSColorValue to return a Color

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"
@@ skipping 91 matching lines @@
     return toStyleRuleKeyframe(keyframe.get());
 }
 
 bool CSSParser::parseSupportsCondition(const String& condition)
 {
     CSSTokenizer::Scope scope(condition);
     CSSParserImpl parser(strictCSSParserContext());
     return CSSSupportsParser::supportsCondition(scope.tokenRange(), parser) == CSSSupportsParser::Supported;
 }
 
-bool CSSParser::parseColor(RGBA32& color, const String& string, bool strict)
+bool CSSParser::parseColor(Color& color, const String& string, bool strict)
 {
     if (string.isEmpty())
         return false;
 
     // The regular color parsers don't resolve named colors, so explicitly
     // handle these first.
     Color namedColor;
     if (namedColor.setNamedColor(string)) {
-        color = namedColor.rgb();
+        color = namedColor;
         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->isColorValue())
         return false;
     color = toCSSColorValue(*value).value();
     return true;
 }
 
-bool CSSParser::parseSystemColor(RGBA32& color, const String& colorString)
+bool CSSParser::parseSystemColor(Color& color, const String& colorString)
 {
     CSSParserString cssColor;
     cssColor.init(colorString);
     CSSValueID id = cssValueKeywordID(cssColor);
     if (!CSSPropertyParser::isSystemColor(id))
         return false;
 
-    Color parsedColor = LayoutTheme::theme().systemColor(id);
-    color = parsedColor.rgb();
+    color = LayoutTheme::theme().systemColor(id);
     return true;
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> CSSParser::parseFontFaceDescriptor(CSSPropertyID propertyID, const String& propertyValue, const CSSParserContext& context)
 {
     StringBuilder builder;
     builder.appendLiteral("@font-face { ");
     builder.append(getPropertyNameString(propertyID));
     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