Clean up fast path CSS color parsing

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/CSSKeyframeRule.h"
 #include "core/css/StyleColor.h"
 #include "core/css/StylePropertySet.h"
@@ skipping 94 matching lines @@
     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)
 {
     if (string.isEmpty())
         return false;
 
-    // First try creating a color specified by name, rgba(), rgb() or "#" syntax.
-    if (CSSParserFastPaths::parseColorAsRGBA32(color, string, !strict))
+    // The regular color parsers don't resolve all named colors, so explicitly
+    // handle these first.
+    Color namedColor;
+    if (namedColor.setNamedColor(string)) {
+        color = namedColor.rgb();
         return true;
+    }
 
-    // In case the fast-path parser didn't understand the color, try the full parser.
-    RefPtrWillBeRawPtr<MutableStylePropertySet> stylePropertySet = MutableStylePropertySet::create();
-    // FIXME: The old CSS parser is only working in strict mode ignoring the strict parameter.
-    // It needs to be investigated why.
-    if (!parseValue(stylePropertySet.get(), CSSPropertyColor, string, false, strictCSSParserContext()))
-        return false;
+    RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, !strict);
+    // TODO(timloh): Why is this always strict mode?
+    if (!value)
+        value = parseSingleValue(CSSPropertyColor, string, strictCSSParserContext());
 
-    RefPtrWillBeRawPtr<CSSValue> value = stylePropertySet->getPropertyCSSValue(CSSPropertyColor);
     if (!value || !value->isPrimitiveValue())
         return false;
 
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());
     if (!primitiveValue->isRGBColor())
         return false;
 
     color = primitiveValue->getRGBA32Value();
     return true;
 }
@@ skipping 29 matching lines @@
     builder.appendLiteral(" : ");
     builder.append(propertyValue);
     builder.appendLiteral("; }");
     RefPtrWillBeRawPtr<StyleRuleBase> rule = parseRule(context, builder.toString());
     if (!rule || !rule->isFontFaceRule())
         return nullptr;
     return toStyleRuleFontFace(rule.get())->properties().getPropertyCSSValue(propertyID);
 }
 
 } // namespace blink