Changed Pair to be a CSSValue

Source/core/animation/DeferredLegacyStyleInterpolation.cpp

Index: Source/core/animation/DeferredLegacyStyleInterpolation.cpp
diff --git a/Source/core/animation/DeferredLegacyStyleInterpolation.cpp b/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
index 95d4b2d072b7cd91ab348118f41f38e69545067f..3ea8090830a5a655674bf3bccf351e3f292ade05 100644
--- a/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
+++ b/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
@@ -14,7 +14,7 @@
 #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"
 
@@ -54,6 +54,8 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
         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())
@@ -86,11 +88,6 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
             || lengthArray[CSSPrimitiveValue::UnitTypeViewportMax] != 0;
     }
 
-    if (Pair* pair = primitiveValue.getPairValue()) {
-        return interpolationRequiresStyleResolve(*pair->first())
-            || interpolationRequiresStyleResolve(*pair->second());
-    }
-
     if (primitiveValue.isShape())
         return interpolationRequiresStyleResolve(*primitiveValue.getShapeValue());
 
@@ -131,6 +128,13 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
     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.