Index: third_party/WebKit/Source/core/animation/LengthInterpolationType.h |
diff --git a/third_party/WebKit/Source/core/animation/LengthInterpolationType.h b/third_party/WebKit/Source/core/animation/LengthInterpolationType.h |
index c8551a337a5411c834fe4de314b31cd6129f0a11..8d35b951bcc7c4711de6b9cb8a3a70633a3c40e0 100644 |
--- a/third_party/WebKit/Source/core/animation/LengthInterpolationType.h |
+++ b/third_party/WebKit/Source/core/animation/LengthInterpolationType.h |
@@ -5,20 +5,20 @@ |
#ifndef LengthInterpolationType_h |
#define LengthInterpolationType_h |
-#include "core/animation/InterpolationType.h" |
+#include "core/animation/CSSInterpolationType.h" |
#include "core/animation/LengthPropertyFunctions.h" |
namespace blink { |
class ComputedStyle; |
-class LengthInterpolationType : public InterpolationType { |
+class LengthInterpolationType : public CSSInterpolationType { |
public: |
LengthInterpolationType(CSSPropertyID); |
- 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 Length resolveInterpolableLength(const InterpolableValue&, const NonInterpolableValue*, const CSSToLengthConversionData&, ValueRange = ValueRangeAll); |
static PassOwnPtr<InterpolableValue> createInterpolablePixels(double pixels); |