Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.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/CSSVisibilityInterpolationType.h"
 
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
@@ skipping 109 matching lines @@
 {
     if (!state.parentStyle())
         return nullptr;
     EVisibility inheritedVisibility = state.parentStyle()->visibility();
     conversionCheckers.append(ParentVisibilityChecker::create(inheritedVisibility));
     return createVisibilityValue(inheritedVisibility);
 }
 
 InterpolationValue CSSVisibilityInterpolationType::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 CSSValueHidden:
     case CSSValueVisible:
     case CSSValueCollapse:
-        return createVisibilityValue(primitiveValue.convertTo<EVisibility>());
+        return createVisibilityValue(identifierValue.convertTo<EVisibility>());
     default:
         return nullptr;
     }
 }
 
 InterpolationValue CSSVisibilityInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const
 {
     return createVisibilityValue(environment.state().style()->visibility());
 }
 
@@ skipping 14 matching lines @@
 
 void CSSVisibilityInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, InterpolationEnvironment& environment) const
 {
     // Visibility interpolation has been deferred to application time here due to its non-linear behaviour.
     double fraction = toInterpolableNumber(interpolableValue).value();
     EVisibility visibility = toCSSVisibilityNonInterpolableValue(nonInterpolableValue)->visibility(fraction);
     environment.state().style()->setVisibility(visibility);
 }
 
 } // namespace blink