diff options
author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 18:30:03 +0000 |
---|---|---|
committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 18:30:03 +0000 |
commit | f49929630e92c553a0ab4f12d800e2ac3a7d689b (patch) | |
tree | c5d12627b2e697fc060fa469ced69dc1171424e2 /cc/CCAnimationCurve.h | |
parent | 677649e4c49946f36a94fac2affee9eab218b812 (diff) | |
download | chromium_src-f49929630e92c553a0ab4f12d800e2ac3a7d689b.zip chromium_src-f49929630e92c553a0ab4f12d800e2ac3a7d689b.tar.gz chromium_src-f49929630e92c553a0ab4f12d800e2ac3a7d689b.tar.bz2 |
Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes
Relanding https://codereview.chromium.org/11078009/
TBR=jamesr
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11085029
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/11086053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCAnimationCurve.h')
-rw-r--r-- | cc/CCAnimationCurve.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/CCAnimationCurve.h b/cc/CCAnimationCurve.h index 7ed6e7a..c177d23 100644 --- a/cc/CCAnimationCurve.h +++ b/cc/CCAnimationCurve.h @@ -5,8 +5,8 @@ #ifndef CCAnimationCurve_h #define CCAnimationCurve_h -#include "base/memory/scoped_ptr.h" #include <public/WebTransformationMatrix.h> +#include <wtf/PassOwnPtr.h> namespace cc { @@ -25,7 +25,7 @@ public: virtual double duration() const = 0; virtual Type type() const = 0; - virtual scoped_ptr<CCAnimationCurve> clone() const = 0; + virtual PassOwnPtr<CCAnimationCurve> clone() const = 0; const CCFloatAnimationCurve* toFloatAnimationCurve() const; const CCTransformAnimationCurve* toTransformAnimationCurve() const; |