| Index: webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
|
| diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
|
| index 09021c7c6afb7837cbc412359920adca2ad2f832..fe0ab808027cfea86ac2a81c8efe2bf0111ad909 100644
|
| --- a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
|
| +++ b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
|
| @@ -156,7 +156,7 @@ TEST(WebTransformAnimationCurveTest, EaseTimingFunction)
|
| curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEase);
|
| curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
|
|
|
| - OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
|
| + scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
|
| for (int i = 0; i <= 4; ++i) {
|
| const double time = i * 0.25;
|
| EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
|
| @@ -191,7 +191,7 @@ TEST(WebTransformAnimationCurveTest, EaseInTimingFunction)
|
| curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseIn);
|
| curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
|
|
|
| - OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
|
| + scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
|
| for (int i = 0; i <= 4; ++i) {
|
| const double time = i * 0.25;
|
| EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
|
| @@ -209,7 +209,7 @@ TEST(WebTransformAnimationCurveTest, EaseOutTimingFunction)
|
| curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseOut);
|
| curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
|
|
|
| - OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
|
| + scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
|
| for (int i = 0; i <= 4; ++i) {
|
| const double time = i * 0.25;
|
| EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
|
| @@ -227,7 +227,7 @@ TEST(WebTransformAnimationCurveTest, EaseInOutTimingFunction)
|
| curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseInOut);
|
| curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
|
|
|
| - OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
|
| + scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
|
| for (int i = 0; i <= 4; ++i) {
|
| const double time = i * 0.25;
|
| EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
|
| @@ -249,7 +249,7 @@ TEST(WebTransformAnimationCurveTest, CustomBezierTimingFunction)
|
| curve->add(WebTransformKeyframe(0, operations1), x1, y1, x2, y2);
|
| curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
|
|
|
| - OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
|
| + scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::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());
|
| @@ -267,7 +267,7 @@ TEST(WebTransformAnimationCurveTest, DefaultTimingFunction)
|
| curve->add(WebTransformKeyframe(0, operations1));
|
| curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
|
|
|
| - OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
|
| + scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
|
| for (int i = 0; i <= 4; ++i) {
|
| const double time = i * 0.25;
|
| EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
|
|
|