webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp - Issue 11086053: Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes

Unified Diff: webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp

Issue 11086053: Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp ('k') | webkit/compositor_bindings/WebTransformAnimationCurveImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp

===================================================================

--- webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp (revision 161134)

+++ webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp (working copy)

@@ -119,7 +119,7 @@

curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEase);

curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);

- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());

+ OwnPtr<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));

@@ -146,7 +146,7 @@

curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseIn);

curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);

- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());

+ OwnPtr<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));

@@ -160,7 +160,7 @@

curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseOut);

curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);

- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());

+ OwnPtr<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));

@@ -174,7 +174,7 @@

curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseInOut);

curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);

- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());

+ OwnPtr<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));

@@ -192,7 +192,7 @@

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));

+ OwnPtr<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));

@@ -206,7 +206,7 @@

curve->add(WebFloatKeyframe(0, 0));

curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);

- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());

+ OwnPtr<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));