Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

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

 // Copyright 2016 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/CSSFontSizeInterpolationType.h"
 
 #include "core/animation/LengthInterpolationFunctions.h"
-#include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "platform/LengthFunctions.h"
 #include "platform/fonts/FontDescription.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 
@@ skipping 77 matching lines @@
     conversionCheckers.append(InheritedFontSizeChecker::create(inheritedFontSize));
     return convertFontSize(inheritedFontSize.value);
 }
 
 InterpolationValue CSSFontSizeInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
 {
     std::unique_ptr<InterpolableValue> result = LengthInterpolationFunctions::maybeConvertCSSValue(value).interpolableValue;
     if (result)
         return InterpolationValue(std::move(result));
 
-    if (!value.isPrimitiveValue() || !toCSSPrimitiveValue(value).isValueID())
+    if (!value.isIdentifierValue())
         return nullptr;
 
-    return maybeConvertKeyword(toCSSPrimitiveValue(value).getValueID(), state, conversionCheckers);
+    return maybeConvertKeyword(toCSSIdentifierValue(value).getValueID(), state, conversionCheckers);
 }
 
 InterpolationValue CSSFontSizeInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const
 {
     return convertFontSize(environment.state().style()->specifiedFontSize());
 }
 
 void CSSFontSizeInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue*, InterpolationEnvironment& environment) const
 {
     const FontDescription& parentFont = environment.state().parentFontDescription();
     Length fontSizeLength = LengthInterpolationFunctions::createLength(interpolableValue, nullptr, environment.state().fontSizeConversionData(), ValueRangeNonNegative);
     float fontSize = floatValueForLength(fontSizeLength, parentFont.getSize().value);
     environment.state().fontBuilder().setSize(FontDescription::Size(0, fontSize, !fontSizeLength.isPercentOrCalc() || parentFont.isAbsoluteSize()));
 }
 
 } // namespace blink