Clean up fast path CSS color parsing

Source/core/css/parser/CSSParserFastPaths.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/CSSParserFastPaths.h"
 
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSValuePool.h"
@@ skipping 410 matching lines @@
             return false;
         if (current != end)
             return false;
         rgb = makeRGB(red, green, blue);
         return true;
     }
 
     return false;
 }
 
-bool CSSParserFastPaths::parseColorAsRGBA32(RGBA32& rgb, const String& name, bool quirksMode)
-{
-    unsigned length = name.length();
-    bool parseResult;
-
-    if (!length)
-        return false;
-
-    if (name.is8Bit())
-        parseResult = fastParseColorInternal(rgb, name.characters8(), length, quirksMode);
-    else
-        parseResult = fastParseColorInternal(rgb, name.characters16(), length, quirksMode);
-
-    if (parseResult)
-        return true;
-
-    // Try named colors.
-    Color tc;
-    if (!tc.setNamedColor(name))
-        return false;
-    rgb = tc.rgb();
-    return true;
-}
-
-static PassRefPtrWillBeRawPtr<CSSValue> parseColor(const String& string, bool quirksMode)
+PassRefPtrWillBeRawPtr<CSSValue> CSSParserFastPaths::parseColor(const String& string, bool quirksMode)
 {
     ASSERT(!string.isEmpty());
     CSSParserString cssString;
     cssString.init(string);
     CSSValueID valueID = cssValueKeywordID(cssString);
     if (valueID == CSSValueWebkitText || valueID == CSSValueCurrentcolor
         || (valueID >= CSSValueAqua && valueID <= CSSValueWindowtext) || valueID == CSSValueMenu
         || (quirksMode && valueID >= CSSValueWebkitFocusRingColor && valueID < CSSValueWebkitText))
         return cssValuePool().createIdentifierValue(valueID);
 
     RGBA32 color;
-    if (!CSSParserFastPaths::parseColorAsRGBA32(color, string, quirksMode))
+
+    // Fast path for hex colors and rgb()/rgba() colors
+    bool parseResult;
+    if (string.is8Bit())
+        parseResult = fastParseColorInternal(color, string.characters8(), string.length(), quirksMode);
+    else
+        parseResult = fastParseColorInternal(color, string.characters16(), string.length(), quirksMode);
+    if (parseResult)
+        return cssValuePool().createColorValue(color);
+
+    Color namedColor;
+    if (!namedColor.setNamedColor(string))
         return nullptr;
-    return cssValuePool().createColorValue(color);
+    return cssValuePool().createColorValue(namedColor.rgb());
 }
 
 bool CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyID propertyId, CSSValueID valueID)
 {
     if (valueID == CSSValueInvalid)
         return false;
 
     switch (propertyId) {
     case CSSPropertyAll:
         return false; // Only accepts css-wide keywords
@@ skipping 482 matching lines @@
     if (isColorPropertyID(propertyID))
         return parseColor(string, isQuirksModeBehavior(parserMode));
     if (RefPtrWillBeRawPtr<CSSValue> keyword = parseKeywordValue(propertyID, string))
         return keyword.release();
     if (RefPtrWillBeRawPtr<CSSValue> transform = parseSimpleTransform(propertyID, string))
         return transform.release();
     return nullptr;
 }
 
 } // namespace blink