Index: webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp |
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp |
index 24c181d93a3cf89e2a2502e0a6cf4bc5f3abea55..1c7822d2ebbe568209bb29244b9aed22c3020382 100644 |
--- a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp |
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp |
@@ -153,7 +153,7 @@ TEST(WebTransformAnimationCurveTest, EaseTimingFunction) |
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEase); |
curve->add(WebTransformKeyframe(1, operations2), 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).m41()); |
@@ -188,7 +188,7 @@ TEST(WebTransformAnimationCurveTest, EaseInTimingFunction) |
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseIn); |
curve->add(WebTransformKeyframe(1, operations2), 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).m41()); |
@@ -206,7 +206,7 @@ TEST(WebTransformAnimationCurveTest, EaseOutTimingFunction) |
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseOut); |
curve->add(WebTransformKeyframe(1, operations2), 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).m41()); |
@@ -224,7 +224,7 @@ TEST(WebTransformAnimationCurveTest, EaseInOutTimingFunction) |
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseInOut); |
curve->add(WebTransformKeyframe(1, operations2), 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).m41()); |
@@ -246,7 +246,7 @@ TEST(WebTransformAnimationCurveTest, CustomBezierTimingFunction) |
curve->add(WebTransformKeyframe(0, operations1), x1, y1, x2, y2); |
curve->add(WebTransformKeyframe(1, operations2), 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).m41()); |
@@ -264,7 +264,7 @@ TEST(WebTransformAnimationCurveTest, DefaultTimingFunction) |
curve->add(WebTransformKeyframe(0, operations1)); |
curve->add(WebTransformKeyframe(1, operations2), 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).m41()); |