Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3530)

Unified Diff: cc/CCTimingFunction.h

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 | « cc/CCLayerTreeHostTest.cpp ('k') | cc/CCTimingFunction.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « cc/CCLayerTreeHostTest.cpp ('k') | cc/CCTimingFunction.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698