Change Rect and Quad to be CSSValues

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 b3b39ba2a6f3aa5e205128cdc869b8f7f8e09450..95d4b2d072b7cd91ab348118f41f38e69545067f 100644
--- a/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
+++ b/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
@@ -10,11 +10,11 @@
 #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/Rect.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/css/resolver/StyleResolverState.h"
 
@@ -50,6 +50,8 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
         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.isImageValue())
@@ -89,22 +91,6 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
             || interpolationRequiresStyleResolve(*pair->second());
     }
 
-    if (primitiveValue.isRect()) {
-        Rect* rect = primitiveValue.getRectValue();
-        return interpolationRequiresStyleResolve(*rect->top())
-            || interpolationRequiresStyleResolve(*rect->right())
-            || interpolationRequiresStyleResolve(*rect->bottom())
-            || interpolationRequiresStyleResolve(*rect->left());
-    }
-
-    if (primitiveValue.isQuad()) {
-        Quad* quad = primitiveValue.getQuadValue();
-        return interpolationRequiresStyleResolve(*quad->top())
-            || interpolationRequiresStyleResolve(*quad->right())
-            || interpolationRequiresStyleResolve(*quad->bottom())
-            || interpolationRequiresStyleResolve(*quad->left());
-    }
-
     if (primitiveValue.isShape())
         return interpolationRequiresStyleResolve(*primitiveValue.getShapeValue());
 
@@ -151,6 +137,15 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
     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);