Align color keyword handling in CSSParserFastPaths with CSSPropertyParser

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;
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> CSSParserFastPaths::parseColor(const String& string, bool quirksMode)
+PassRefPtrWillBeRawPtr<CSSValue> CSSParserFastPaths::parseColor(const String& string, CSSParserMode parserMode)
 {
     ASSERT(!string.isEmpty());
     CSSParserString cssString;
     cssString.init(string);
     CSSValueID valueID = cssValueKeywordID(cssString);
-    if (valueID == CSSValueCurrentcolor || valueID == CSSValueGrey
-        || (valueID >= CSSValueAqua && valueID <= CSSValueWindowtext) || valueID == CSSValueMenu
-        || (quirksMode && valueID >= CSSValueWebkitFocusRingColor && valueID <= CSSValueWebkitText))
+    if (CSSPropertyParser::isColorKeyword(valueID)) {
+        if (!isValueAllowedInMode(valueID, parserMode))

[fs, 2015/07/13 13:59:28]

Could also just have picked HTMLStandardMode/HTMLQuirksMode based on the
existing bool (for a smaller change)... Let me know which you prefer.

+            return nullptr;
         return cssValuePool().createIdentifierValue(valueID);
+    }
 
     RGBA32 color;
+    bool quirksMode = isQuirksModeBehavior(parserMode);
 
     // 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);
 
@@ skipping 487 matching lines @@
     const UChar* pos = string.characters16();
     const UChar* end = pos + string.length();
     return parseSimpleTransformList(pos, end);
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> CSSParserFastPaths::maybeParseValue(CSSPropertyID propertyID, const String& string, CSSParserMode parserMode)
 {
     if (RefPtrWillBeRawPtr<CSSValue> length = parseSimpleLengthValue(propertyID, string, parserMode))
         return length.release();
     if (isColorPropertyID(propertyID))
-        return parseColor(string, isQuirksModeBehavior(parserMode));
+        return parseColor(string, 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