diff options
| author | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 08:30:58 +0000 |
|---|---|---|
| committer | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 08:30:58 +0000 |
| commit | b207e268e982d39f2e2002ab1ed8ea27b10b77be (patch) | |
| tree | 30bac266c16a3f74b53c55aa8dc3e35b0ab023fb /webkit/compositor_bindings/WebAnimationImpl.h | |
| parent | 71eb2e7981b70013a2c44e32c6e75a54889ac747 (diff) | |
| download | chromium_src-b207e268e982d39f2e2002ab1ed8ea27b10b77be.zip chromium_src-b207e268e982d39f2e2002ab1ed8ea27b10b77be.tar.gz chromium_src-b207e268e982d39f2e2002ab1ed8ea27b10b77be.tar.bz2 | |
Revert 160630 - [cc] Use base ptr types for cc's CSS animation classes
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11078009
TBR=enne@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings/WebAnimationImpl.h')
| -rw-r--r-- | webkit/compositor_bindings/WebAnimationImpl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/compositor_bindings/WebAnimationImpl.h b/webkit/compositor_bindings/WebAnimationImpl.h index d15eeb3..a4abfc9 100644 --- a/webkit/compositor_bindings/WebAnimationImpl.h +++ b/webkit/compositor_bindings/WebAnimationImpl.h @@ -5,7 +5,6 @@ #ifndef WebAnimationImpl_h #define WebAnimationImpl_h -#include "base/memory/scoped_ptr.h" #include <public/WebAnimation.h> #include <wtf/OwnPtr.h> #include <wtf/PassOwnPtr.h> @@ -33,10 +32,9 @@ public: virtual bool alternatesDirection() const OVERRIDE; virtual void setAlternatesDirection(bool) OVERRIDE; - scoped_ptr<cc::CCActiveAnimation> cloneToCCAnimation(); - + PassOwnPtr<cc::CCActiveAnimation> cloneToCCAnimation(); private: - scoped_ptr<cc::CCActiveAnimation> m_animation; + OwnPtr<cc::CCActiveAnimation> m_animation; }; } |