Index: cc/CCTimingFunction.cpp |
diff --git a/cc/CCTimingFunction.cpp b/cc/CCTimingFunction.cpp |
index 224a0bac0669e0c18db065a5235f61a15f04263b..3a4ecd45a4c304f54073f3d0e07a7bb8fd6f4844 100644 |
--- a/cc/CCTimingFunction.cpp |
+++ b/cc/CCTimingFunction.cpp |
@@ -6,8 +6,6 @@ |
#include "CCTimingFunction.h" |
-#include <wtf/OwnPtr.h> |
- |
namespace { |
const double epsilon = 1e-6; |
} // namespace |
@@ -27,9 +25,9 @@ double CCTimingFunction::duration() const |
return 1.0; |
} |
-PassOwnPtr<CCCubicBezierTimingFunction> CCCubicBezierTimingFunction::create(double x1, double y1, double x2, double y2) |
+scoped_ptr<CCCubicBezierTimingFunction> CCCubicBezierTimingFunction::create(double x1, double y1, double x2, double y2) |
{ |
- return adoptPtr(new CCCubicBezierTimingFunction(x1, y1, x2, y2)); |
+ return make_scoped_ptr(new CCCubicBezierTimingFunction(x1, y1, x2, y2)); |
} |
CCCubicBezierTimingFunction::CCCubicBezierTimingFunction(double x1, double y1, double x2, double y2) |
@@ -47,30 +45,30 @@ float CCCubicBezierTimingFunction::getValue(double x) const |
return static_cast<float>(temp.solve(x, epsilon)); |
} |
-PassOwnPtr<CCAnimationCurve> CCCubicBezierTimingFunction::clone() const |
+scoped_ptr<CCAnimationCurve> CCCubicBezierTimingFunction::clone() const |
{ |
- return adoptPtr(new CCCubicBezierTimingFunction(*this)); |
+ return make_scoped_ptr(new CCCubicBezierTimingFunction(*this)).PassAs<CCAnimationCurve>(); |
} |
// These numbers come from http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag. |
-PassOwnPtr<CCTimingFunction> CCEaseTimingFunction::create() |
+scoped_ptr<CCTimingFunction> CCEaseTimingFunction::create() |
{ |
- return CCCubicBezierTimingFunction::create(0.25, 0.1, 0.25, 1); |
+ return CCCubicBezierTimingFunction::create(0.25, 0.1, 0.25, 1).PassAs<CCTimingFunction>(); |
} |
-PassOwnPtr<CCTimingFunction> CCEaseInTimingFunction::create() |
+scoped_ptr<CCTimingFunction> CCEaseInTimingFunction::create() |
{ |
- return CCCubicBezierTimingFunction::create(0.42, 0, 1.0, 1); |
+ return CCCubicBezierTimingFunction::create(0.42, 0, 1.0, 1).PassAs<CCTimingFunction>(); |
} |
-PassOwnPtr<CCTimingFunction> CCEaseOutTimingFunction::create() |
+scoped_ptr<CCTimingFunction> CCEaseOutTimingFunction::create() |
{ |
- return CCCubicBezierTimingFunction::create(0, 0, 0.58, 1); |
+ return CCCubicBezierTimingFunction::create(0, 0, 0.58, 1).PassAs<CCTimingFunction>(); |
} |
-PassOwnPtr<CCTimingFunction> CCEaseInOutTimingFunction::create() |
+scoped_ptr<CCTimingFunction> CCEaseInOutTimingFunction::create() |
{ |
- return CCCubicBezierTimingFunction::create(0.42, 0, 0.58, 1); |
+ return CCCubicBezierTimingFunction::create(0.42, 0, 0.58, 1).PassAs<CCTimingFunction>(); |
} |
} // namespace cc |