Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes

cc/CCTimingFunction.cpp

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