Move isColorKeyword out of CSSPropertyParser

third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp

 // Copyright 2015 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 "core/animation/CSSColorInterpolationType.h"
 
 #include "core/animation/ColorPropertyFunctions.h"
 #include "core/css/CSSColorValue.h"
 #include "core/css/parser/CSSPropertyParser.h"

[Timothy Loh, 2016/06/08 03:21:11]

no longer needed

[rwlbuis, 2016/06/08 23:08:39]

Done.

 #include "core/css/resolver/StyleResolverState.h"
 #include "core/layout/LayoutTheme.h"
 
 namespace blink {
 
 enum InterpolableColorIndex {
     Red,
     Green,
     Blue,
     Alpha,
@@ skipping 34 matching lines @@
         return createInterpolableColorForIndex(Currentcolor);
     case CSSValueWebkitActivelink:
         return createInterpolableColorForIndex(WebkitActivelink);
     case CSSValueWebkitLink:
         return createInterpolableColorForIndex(WebkitLink);
     case CSSValueInternalQuirkInherit:
         return createInterpolableColorForIndex(QuirkInherit);
     case CSSValueWebkitFocusRingColor:
         return createInterpolableColor(LayoutTheme::theme().focusRingColor());
     default:
         ASSERT(CSSPropertyParser::isColorKeyword(keyword));

[Timothy Loh, 2016/06/08 03:21:11]

needs to be updated

[rwlbuis, 2016/06/08 23:08:39]

Done. Also made it a DCHECK since the style check suggested it.

         return createInterpolableColor(StyleColor::colorFromKeyword(keyword));
     }
 }
 
 PassOwnPtr<InterpolableValue> CSSColorInterpolationType::createInterpolableColor(const StyleColor& color)
 {
     if (color.isCurrentColor())
         return createInterpolableColorForIndex(Currentcolor);
     return createInterpolableColor(color.getColor());
 }
 
 PassOwnPtr<InterpolableValue> CSSColorInterpolationType::maybeCreateInterpolableColor(const CSSValue& value)
 {
     if (value.isColorValue())
         return createInterpolableColor(toCSSColorValue(value).value());
     if (!value.isPrimitiveValue())
         return nullptr;
     const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
     if (!primitive.isValueID())
         return nullptr;
-    if (!CSSPropertyParser::isColorKeyword(primitive.getValueID()))
+    if (!isColorKeyword(primitive.getValueID()))
         return nullptr;
     return createInterpolableColor(primitive.getValueID());
 }
 
 static void addPremultipliedColor(double& red, double& green, double& blue, double& alpha, double fraction, const Color& color)
 {
     double colorAlpha = color.alpha();
     red += fraction * color.red() * colorAlpha;
     green += fraction * color.green() * colorAlpha;
     blue += fraction * color.blue() * colorAlpha;
@@ skipping 120 matching lines @@
 {
     const InterpolableList& colorPair = toInterpolableList(interpolableValue);
     ASSERT(colorPair.length() == InterpolableColorPairIndexCount);
     ColorPropertyFunctions::setUnvisitedColor(cssProperty(), *environment.state().style(),
         resolveInterpolableColor(*colorPair.get(Unvisited), environment.state(), false, cssProperty() == CSSPropertyTextDecorationColor));
     ColorPropertyFunctions::setVisitedColor(cssProperty(), *environment.state().style(),
         resolveInterpolableColor(*colorPair.get(Visited), environment.state(), true, cssProperty() == CSSPropertyTextDecorationColor));
 }
 
 } // namespace blink