Remove CSSValue::Type and CSSValue::cssValueType()

Source/core/animation/DeferredLegacyStyleInterpolation.cpp

 // Copyright 2014 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 "config.h"
 #include "core/animation/DeferredLegacyStyleInterpolation.h"
 
 #include "core/animation/LegacyStyleInterpolation.h"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSPrimitiveValue.h"
@@ skipping 12 matching lines @@
     RefPtrWillBeRawPtr<LegacyStyleInterpolation> innerInterpolation = LegacyStyleInterpolation::create(
         StyleResolver::createAnimatableValueSnapshot(state, m_id, *m_startCSSValue),
         StyleResolver::createAnimatableValueSnapshot(state, m_id, *m_endCSSValue),
         m_id);
     innerInterpolation->interpolate(m_cachedIteration, m_cachedFraction);
     innerInterpolation->apply(state);
 }
 
 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSValue& value)
 {
-    switch (value.cssValueType()) {
-    case CSSValue::CSS_INHERIT:
+    // FIXME: should not require resolving styles for initial.
+    if (value.isInitialValue() || value.isInheritedValue())
         return true;
-    case CSSValue::CSS_PRIMITIVE_VALUE:
+    if (value.isPrimitiveValue())
         return interpolationRequiresStyleResolve(toCSSPrimitiveValue(value));
-    case CSSValue::CSS_VALUE_LIST:
+    if (value.isValueList())
         return interpolationRequiresStyleResolve(toCSSValueList(value));
-    case CSSValue::CSS_CUSTOM:
-        if (value.isImageValue())
-            return interpolationRequiresStyleResolve(toCSSImageValue(value));
-        if (value.isShadowValue())
-            return interpolationRequiresStyleResolve(toCSSShadowValue(value));
-        if (value.isSVGDocumentValue())
-            return interpolationRequiresStyleResolve(toCSSSVGDocumentValue(value));
-        // FIXME: consider other custom types.
-        return true;
-    case CSSValue::CSS_INITIAL:
-        // FIXME: should not require resolving styles for initial.
-        return true;
-    default:
-        ASSERT_NOT_REACHED();
-        return true;
-    }
+    if (value.isImageValue())
+        return interpolationRequiresStyleResolve(toCSSImageValue(value));
+    if (value.isShadowValue())
+        return interpolationRequiresStyleResolve(toCSSShadowValue(value));
+    if (value.isSVGDocumentValue())
+        return interpolationRequiresStyleResolve(toCSSSVGDocumentValue(value));
+    // FIXME: consider other custom types.
+    return true;
 }
 
 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSPrimitiveValue& primitiveValue)
 {
     // FIXME: consider other types.
     if (primitiveValue.isNumber() || primitiveValue.isPercentage() || primitiveValue.isAngle() || primitiveValue.isRGBColor() || primitiveValue.isURI())
         return false;
 
     if (primitiveValue.isLength())
         return primitiveValue.isFontRelativeLength() || primitiveValue.isViewportPercentageLength();
@@ skipping 77 matching lines @@
 }
 
 void DeferredLegacyStyleInterpolation::trace(Visitor* visitor)
 {
     visitor->trace(m_startCSSValue);
     visitor->trace(m_endCSSValue);
     StyleInterpolation::trace(visitor);
 }
 
 }