Index: third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp |
diff --git a/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp b/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp |
index def126367e52b4a53e3120a172dbe9580b37954d..d43fc24044584b41a23bdcc9e7996b71950a899e 100644 |
--- a/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp |
+++ b/third_party/WebKit/Source/core/animation/InterpolableValueTest.cpp |
@@ -14,7 +14,7 @@ namespace { |
class SampleInterpolation : public LegacyStyleInterpolation { |
public: |
- static PassRefPtr<Interpolation> create( |
+ static PassRefPtr<LegacyStyleInterpolation> create( |
std::unique_ptr<InterpolableValue> start, |
std::unique_ptr<InterpolableValue> end) { |
return adoptRef(new SampleInterpolation(std::move(start), std::move(end))); |
@@ -32,12 +32,13 @@ class SampleInterpolation : public LegacyStyleInterpolation { |
class AnimationInterpolableValueTest : public ::testing::Test { |
protected: |
- InterpolableValue* interpolationValue(Interpolation& interpolation) { |
+ InterpolableValue* interpolationValue( |
+ LegacyStyleInterpolation& interpolation) { |
return interpolation.getCachedValueForTesting(); |
} |
double interpolateNumbers(double a, double b, double progress) { |
- RefPtr<Interpolation> i = SampleInterpolation::create( |
+ RefPtr<LegacyStyleInterpolation> i = SampleInterpolation::create( |
InterpolableNumber::create(a), InterpolableNumber::create(b)); |
i->interpolate(0, progress); |
return toInterpolableNumber(interpolationValue(*i.get()))->value(); |
@@ -49,11 +50,11 @@ class AnimationInterpolableValueTest : public ::testing::Test { |
base.scaleAndAdd(scale, add); |
} |
- PassRefPtr<Interpolation> interpolateLists( |
+ PassRefPtr<LegacyStyleInterpolation> interpolateLists( |
std::unique_ptr<InterpolableList> listA, |
std::unique_ptr<InterpolableList> listB, |
double progress) { |
- RefPtr<Interpolation> i = |
+ RefPtr<LegacyStyleInterpolation> i = |
SampleInterpolation::create(std::move(listA), std::move(listB)); |
i->interpolate(0, progress); |
return i; |
@@ -80,7 +81,7 @@ TEST_F(AnimationInterpolableValueTest, SimpleList) { |
listB->set(1, InterpolableNumber::create(-200)); |
listB->set(2, InterpolableNumber::create(300)); |
- RefPtr<Interpolation> i = |
+ RefPtr<LegacyStyleInterpolation> i = |
interpolateLists(std::move(listA), std::move(listB), 0.3); |
InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())); |
EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList->get(0))->value()); |
@@ -103,7 +104,7 @@ TEST_F(AnimationInterpolableValueTest, NestedList) { |
listB->set(1, std::move(subListB)); |
listB->set(2, InterpolableNumber::create(1)); |
- RefPtr<Interpolation> i = |
+ RefPtr<LegacyStyleInterpolation> i = |
interpolateLists(std::move(listA), std::move(listB), 0.5); |
InterpolableList* outList = toInterpolableList(interpolationValue(*i.get())); |
EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList->get(0))->value()); |