Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.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/CSSLengthInterpolationType.h"
 
 #include "core/animation/LengthInterpolationFunctions.h"
 #include "core/animation/LengthPropertyFunctions.h"
 #include "core/animation/css/CSSAnimatableValueFactory.h"
 #include "core/css/CSSCalculationValue.h"
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "platform/LengthFunctions.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 CSSLengthInterpolationType::CSSLengthInterpolationType(PropertyHandle property)
     : CSSInterpolationType(property)
@@ skipping 49 matching lines @@
         return nullptr;
     Length inheritedLength;
     if (!LengthPropertyFunctions::getLength(cssProperty(), *state.parentStyle(), inheritedLength))
         return nullptr;
     conversionCheckers.append(ParentLengthChecker::create(cssProperty(), inheritedLength));
     return LengthInterpolationFunctions::maybeConvertLength(inheritedLength, effectiveZoom(*state.parentStyle()));
 }
 
 InterpolationValue CSSLengthInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers& conversionCheckers) const
 {
-    if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).isValueID()) {
-        CSSValueID valueID = toCSSPrimitiveValue(value).getValueID();
+    if (value.isIdentifierValue()) {
+        CSSValueID valueID = toCSSIdentifierValue(value).getValueID();
         double pixels;
         if (!LengthPropertyFunctions::getPixelsForKeyword(cssProperty(), valueID, pixels))
             return nullptr;
         return InterpolationValue(LengthInterpolationFunctions::createInterpolablePixels(pixels));
     }
 
     return LengthInterpolationFunctions::maybeConvertCSSValue(value);
 }
 
 PairwiseInterpolationValue CSSLengthInterpolationType::maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end) const
@@ skipping 22 matching lines @@
     ComputedStyle& style = *state.style();
     float zoom = effectiveZoom(style);
     Length length = LengthInterpolationFunctions::createLength(interpolableValue, nonInterpolableValue, state.cssToLengthConversionData(), m_valueRange);
     if (LengthPropertyFunctions::setLength(cssProperty(), style, length)) {
 #if DCHECK_IS_ON()
         // Assert that setting the length on ComputedStyle directly is identical to the StyleBuilder code path.
         // This check is useful for catching differences in clamping behaviour.
         Length before;
         Length after;
         DCHECK(LengthPropertyFunctions::getLength(cssProperty(), style, before));
-        StyleBuilder::applyProperty(cssProperty(), state, *CSSPrimitiveValue::create(length, zoom));
+        StyleBuilder::applyProperty(cssProperty(), state, *CSSValue::create(length, zoom));
         DCHECK(LengthPropertyFunctions::getLength(cssProperty(), style, after));
         DCHECK_EQ(before.type(), after.type());
         if (before.isSpecified()) {
             const float kSlack = 0.1;
             float delta = floatValueForLength(after, 100) - floatValueForLength(before, 100);
             DCHECK_LT(std::abs(delta), kSlack);
         }
 #endif
         return;
     }
-    StyleBuilder::applyProperty(cssProperty(), state, *CSSPrimitiveValue::create(length, zoom));
+    StyleBuilder::applyProperty(cssProperty(), state, *CSSValue::create(length, zoom));
 }
 
 } // namespace blink