| Index: cc/CCTimingFunction.h
|
| ===================================================================
|
| --- cc/CCTimingFunction.h (revision 161134)
|
| +++ cc/CCTimingFunction.h (working copy)
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "CCAnimationCurve.h"
|
| #include "UnitBezier.h"
|
| +#include <wtf/PassOwnPtr.h>
|
|
|
| namespace cc {
|
|
|
| @@ -24,12 +25,12 @@
|
|
|
| class CCCubicBezierTimingFunction : public CCTimingFunction {
|
| public:
|
| - static scoped_ptr<CCCubicBezierTimingFunction> create(double x1, double y1, double x2, double y2);
|
| + static PassOwnPtr<CCCubicBezierTimingFunction> create(double x1, double y1, double x2, double y2);
|
| virtual ~CCCubicBezierTimingFunction();
|
|
|
| // Partial implementation of CCFloatAnimationCurve.
|
| virtual float getValue(double time) const OVERRIDE;
|
| - virtual scoped_ptr<CCAnimationCurve> clone() const OVERRIDE;
|
| + virtual PassOwnPtr<CCAnimationCurve> clone() const OVERRIDE;
|
|
|
| protected:
|
| CCCubicBezierTimingFunction(double x1, double y1, double x2, double y2);
|
| @@ -39,22 +40,22 @@
|
|
|
| class CCEaseTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static PassOwnPtr<CCTimingFunction> create();
|
| };
|
|
|
| class CCEaseInTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static PassOwnPtr<CCTimingFunction> create();
|
| };
|
|
|
| class CCEaseOutTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static PassOwnPtr<CCTimingFunction> create();
|
| };
|
|
|
| class CCEaseInOutTimingFunction {
|
| public:
|
| - static scoped_ptr<CCTimingFunction> create();
|
| + static PassOwnPtr<CCTimingFunction> create();
|
| };
|
|
|
| } // namespace cc
|
|
|