Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

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/CSSIdentifierValue.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/layout/LayoutTheme.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 enum InterpolableColorIndex : unsigned {
     Red,
     Green,
@@ skipping 52 matching lines @@
 {
     if (color.isCurrentColor())
         return createInterpolableColorForIndex(Currentcolor);
     return createInterpolableColor(color.getColor());
 }
 
 std::unique_ptr<InterpolableValue> CSSColorInterpolationType::maybeCreateInterpolableColor(const CSSValue& value)
 {
     if (value.isColorValue())
         return createInterpolableColor(toCSSColorValue(value).value());
-    if (!value.isPrimitiveValue())
+    if (!value.isIdentifierValue())
         return nullptr;
-    const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
-    if (!primitive.isValueID())
+    const CSSIdentifierValue& ident = toCSSIdentifierValue(value);

[rjwright, 2016/09/22 01:29:55]

Avoid abbreviated variable names. You've used "identifierValue" elsewhere.

+    if (!StyleColor::isColorKeyword(ident.getValueID()))
         return nullptr;
-    if (!StyleColor::isColorKeyword(primitive.getValueID()))
-        return nullptr;
-    return createInterpolableColor(primitive.getValueID());
+    return createInterpolableColor(ident.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;
     alpha += fraction * colorAlpha;
 }
@@ skipping 80 matching lines @@
 }
 
 enum InterpolableColorPairIndex : unsigned {
     Unvisited,
     Visited,
     InterpolableColorPairIndexCount,
 };
 
 InterpolationValue CSSColorInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
 {
-    if (cssProperty() == CSSPropertyColor && value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueCurrentcolor)
+    if (cssProperty() == CSSPropertyColor && value.isIdentifierValue() && toCSSIdentifierValue(value).getValueID() == CSSValueCurrentcolor)
         return maybeConvertInherit(state, conversionCheckers);
 
     std::unique_ptr<InterpolableValue> interpolableColor = maybeCreateInterpolableColor(value);
     if (!interpolableColor)
         return nullptr;
     std::unique_ptr<InterpolableList> colorPair = InterpolableList::create(InterpolableColorPairIndexCount);
     colorPair->set(Unvisited, interpolableColor->clone());
     colorPair->set(Visited, std::move(interpolableColor));
     return InterpolationValue(std::move(colorPair));
 }
@@ skipping 17 matching lines @@
 {
     const InterpolableList& colorPair = toInterpolableList(interpolableValue);
     DCHECK_EQ(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