Changed Pair to be a CSSValue

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"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSQuadValue.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSValueList.h"
-#include "core/css/Pair.h"
+#include "core/css/CSSValuePair.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/css/resolver/StyleResolverState.h"
 
 namespace blink {
 
 void DeferredLegacyStyleInterpolation::apply(StyleResolverState& state) const
 {
     if (m_outdated || !state.element()->elementAnimations() || !state.element()->elementAnimations()->isAnimationStyleChange()) {
         RefPtrWillBeRawPtr<AnimatableValue> startAnimatableValue;
         RefPtrWillBeRawPtr<AnimatableValue> endAnimatableValue;
@@ skipping 19 matching lines @@
 {
     // FIXME: should not require resolving styles for inherit/initial/unset.
     if (value.isCSSWideKeyword())
         return true;
     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;
 }
 
@@ skipping 12 matching lines @@
         return lengthArray[CSSPrimitiveValue::UnitTypeFontSize] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeFontXSize] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeRootFontSize] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeZeroCharacterWidth] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeViewportWidth] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeViewportHeight] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeViewportMin] != 0
             || lengthArray[CSSPrimitiveValue::UnitTypeViewportMax] != 0;
     }
 
-    if (Pair* pair = primitiveValue.getPairValue()) {
-        return interpolationRequiresStyleResolve(*pair->first())
-            || interpolationRequiresStyleResolve(*pair->second());
-    }
-
     if (primitiveValue.isShape())
         return interpolationRequiresStyleResolve(*primitiveValue.getShapeValue());
 
     CSSValueID id = primitiveValue.getValueID();
     bool isColor = ((id >= CSSValueAqua && id <= CSSValueTransparent)
         || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen)
         || id == CSSValueGrey);
     return (id != CSSValueNone) && !isColor;
 }
 
@@ skipping 20 matching lines @@
 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSValueList& valueList)
 {
     size_t length = valueList.length();
     for (size_t index = 0; index < length; ++index) {
         if (interpolationRequiresStyleResolve(*valueList.item(index)))
             return true;
     }
     return false;
 }
 
+bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSValuePair& pair)
+{
+    return interpolationRequiresStyleResolve(*pair.first())
+        || interpolationRequiresStyleResolve(*pair.second());
+}
+

[Timothy Loh, 2015/08/28 05:51:46]

extra blank line

[sashab, 2015/08/31 00:33:51]

Thank you, got rid of one later too (unrelated to this patch but whatever)

+
 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSBasicShape& shape)
 {
     // FIXME: Should determine the specific shape, and inspect the members.
     return false;
 }
 
 bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSQuadValue& quad)
 {
     return interpolationRequiresStyleResolve(*quad.top())
         || interpolationRequiresStyleResolve(*quad.right())
         || interpolationRequiresStyleResolve(*quad.bottom())
         || interpolationRequiresStyleResolve(*quad.left());
 }
 
 
 DEFINE_TRACE(DeferredLegacyStyleInterpolation)
 {
     visitor->trace(m_startCSSValue);
     visitor->trace(m_endCSSValue);
     visitor->trace(m_innerInterpolation);
     StyleInterpolation::trace(visitor);
 }
 
 }