Split out String, URI and CustomIdent from CSSPrimitiveValue

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/ElementAnimations.h"
 #include "core/animation/css/CSSAnimatableValueFactory.h"
 #include "core/css/CSSBasicShapes.h"
@@ skipping 30 matching lines @@
 
     m_innerInterpolation->interpolate(m_cachedIteration, m_cachedFraction);
     m_innerInterpolation->apply(state);
 }
 
 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSValue& value)
 {
     // FIXME: should not require resolving styles for inherit/initial/unset.
     if (value.isCSSWideKeyword())
         return true;
+    if (value.isStringValue() || value.isURIValue() || value.isCustomIdentValue())
+        return false;
     if (value.isPrimitiveValue())
         return interpolationRequiresStyleResolve(toCSSPrimitiveValue(value));
     if (value.isQuadValue())
         return interpolationRequiresStyleResolve(toCSSQuadValue(value));
     if (value.isValueList())
         return interpolationRequiresStyleResolve(toCSSValueList(value));
     if (value.isValuePair())
         return interpolationRequiresStyleResolve(toCSSValuePair(value));
     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())
+    if (primitiveValue.isNumber() || primitiveValue.isPercentage() || primitiveValue.isAngle() || primitiveValue.isRGBColor())
         return false;
 
     if (primitiveValue.isLength())
         return primitiveValue.isFontRelativeLength() || primitiveValue.isViewportPercentageLength();
 
     if (primitiveValue.isCalculated()) {
         CSSLengthArray lengthArray(CSSPrimitiveValue::LengthUnitTypeCount);
         primitiveValue.accumulateLengthArray(lengthArray);
         return lengthArray[CSSPrimitiveValue::UnitTypeFontSize] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeFontXSize] != 0
@@ skipping 59 matching lines @@
 
 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSQuadValue& quad)
 {
     return interpolationRequiresStyleResolve(*quad.top())
         || interpolationRequiresStyleResolve(*quad.right())
         || interpolationRequiresStyleResolve(*quad.bottom())
         || interpolationRequiresStyleResolve(*quad.left());
 }
 
 }