Web Animations: Remove CSS dependence from InterpolationType

third_party/WebKit/Source/core/animation/ImageInterpolationType.h

Index: third_party/WebKit/Source/core/animation/ImageInterpolationType.h
diff --git a/third_party/WebKit/Source/core/animation/ImageInterpolationType.h b/third_party/WebKit/Source/core/animation/ImageInterpolationType.h
index 4357137f4434e6c798232b37801ec25e8f8f91b7..771f6baa0d39a882c3b838068558f1d8ef208e88 100644
--- a/third_party/WebKit/Source/core/animation/ImageInterpolationType.h
+++ b/third_party/WebKit/Source/core/animation/ImageInterpolationType.h
@@ -5,21 +5,21 @@
 #ifndef ImageInterpolationType_h
 #define ImageInterpolationType_h
 
-#include "core/animation/InterpolationType.h"
+#include "core/animation/CSSInterpolationType.h"
 
 namespace blink {
 
 class StyleImage;
 
-class ImageInterpolationType : public InterpolationType {
+class ImageInterpolationType : public CSSInterpolationType {
 public:
     ImageInterpolationType(CSSPropertyID property)
-        : InterpolationType(property)
+        : CSSInterpolationType(property)
     { }
 
-    PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const StyleResolverState&) const final;
+    PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const final;
     void composite(UnderlyingValue&, double underlyingFraction, const InterpolationValue&) const final;
-    void apply(const InterpolableValue&, const NonInterpolableValue*, StyleResolverState&) const final;
+    void apply(const InterpolableValue&, const NonInterpolableValue*, InterpolationEnvironment&) const final;
 
     static InterpolationComponent maybeConvertCSSValue(const CSSValue&, bool acceptGradients);
     static InterpolationComponent maybeConvertStyleImage(const StyleImage&, bool acceptGradients);