Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/animation/CSSFontWeightInterpolationType.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/CSSFontWeightInterpolationType.h"
 
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
@@ skipping 85 matching lines @@
 {
     if (!state.parentStyle())
         return nullptr;
     FontWeight inheritedFontWeight = state.parentStyle()->fontWeight();
     conversionCheckers.append(ParentFontWeightChecker::create(inheritedFontWeight));
     return createFontWeightValue(inheritedFontWeight);
 }
 
 InterpolationValue CSSFontWeightInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
 {
-    if (!value.isPrimitiveValue())
+    if (!value.isIdentifierValue())
         return nullptr;
 
-    const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
-    CSSValueID keyword = primitiveValue.getValueID();
+    const CSSIdentifierValue& identifierValue = toCSSIdentifierValue(value);
+    CSSValueID keyword = identifierValue.getValueID();
 
     switch (keyword) {
     case CSSValueInvalid:
         return nullptr;
 
     case CSSValueBolder:
     case CSSValueLighter: {
         FontWeight inheritedFontWeight = state.parentStyle()->fontWeight();
         conversionCheckers.append(ParentFontWeightChecker::create(inheritedFontWeight));
         if (keyword == CSSValueBolder)
             return createFontWeightValue(FontDescription::bolderWeight(inheritedFontWeight));
         return createFontWeightValue(FontDescription::lighterWeight(inheritedFontWeight));
     }
 
     default:
-        return createFontWeightValue(primitiveValue.convertTo<FontWeight>());
+        return createFontWeightValue(identifierValue.convertTo<FontWeight>());
     }
 }
 
 InterpolationValue CSSFontWeightInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const
 {
     return createFontWeightValue(environment.state().style()->fontWeight());
 }
 
 void CSSFontWeightInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue*, InterpolationEnvironment& environment) const
 {
     environment.state().fontBuilder().setWeight(doubleToFontWeight(toInterpolableNumber(interpolableValue).value()));
 }
 
 } // namespace blink