Index: webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp |
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp |
index 4342d43b5595e3160f23d4afc106cbebf2d49890..240c97270a7efa71613efe55924c2ca10798b20b 100644 |
--- a/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp |
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp |
@@ -116,7 +116,7 @@ TEST(WebFloatAnimationCurveTest, EaseTimingFunction) |
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEase); |
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear); |
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create()); |
+ scoped_ptr<cc::TimingFunction> timingFunction(cc::EaseTimingFunction::create()); |
for (int i = 0; i <= 4; ++i) { |
const double time = i * 0.25; |
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time)); |
@@ -143,7 +143,7 @@ TEST(WebFloatAnimationCurveTest, EaseInTimingFunction) |
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseIn); |
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear); |
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create()); |
+ scoped_ptr<cc::TimingFunction> timingFunction(cc::EaseInTimingFunction::create()); |
for (int i = 0; i <= 4; ++i) { |
const double time = i * 0.25; |
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time)); |
@@ -157,7 +157,7 @@ TEST(WebFloatAnimationCurveTest, EaseOutTimingFunction) |
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseOut); |
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear); |
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create()); |
+ scoped_ptr<cc::TimingFunction> timingFunction(cc::EaseOutTimingFunction::create()); |
for (int i = 0; i <= 4; ++i) { |
const double time = i * 0.25; |
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time)); |
@@ -171,7 +171,7 @@ TEST(WebFloatAnimationCurveTest, EaseInOutTimingFunction) |
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseInOut); |
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear); |
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create()); |
+ scoped_ptr<cc::TimingFunction> timingFunction(cc::EaseInOutTimingFunction::create()); |
for (int i = 0; i <= 4; ++i) { |
const double time = i * 0.25; |
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time)); |
@@ -189,7 +189,7 @@ TEST(WebFloatAnimationCurveTest, CustomBezierTimingFunction) |
curve->add(WebFloatKeyframe(0, 0), x1, y1, x2, y2); |
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear); |
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)); |
+ scoped_ptr<cc::TimingFunction> timingFunction(cc::CubicBezierTimingFunction::create(x1, y1, x2, y2)); |
for (int i = 0; i <= 4; ++i) { |
const double time = i * 0.25; |
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time)); |
@@ -203,7 +203,7 @@ TEST(WebFloatAnimationCurveTest, DefaultTimingFunction) |
curve->add(WebFloatKeyframe(0, 0)); |
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear); |
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create()); |
+ scoped_ptr<cc::TimingFunction> timingFunction(cc::EaseTimingFunction::create()); |
for (int i = 0; i <= 4; ++i) { |
const double time = i * 0.25; |
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time)); |