diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 06:54:41 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 06:54:41 +0000 |
| commit | 28468de002bfefc84895e854d358bef0abd88ae6 (patch) | |
| tree | 2c44dd1b5121d5f1b90f88688f5d375d5a66bfa5 /webkit/compositor_bindings/WebTransformAnimationCurveImpl.h | |
| parent | d9543896f8112191cc1e7cd56c0f53e768710940 (diff) | |
| download | chromium_src-28468de002bfefc84895e854d358bef0abd88ae6.zip chromium_src-28468de002bfefc84895e854d358bef0abd88ae6.tar.gz chromium_src-28468de002bfefc84895e854d358bef0abd88ae6.tar.bz2 | |
Revert 161488 - [cc] Use base ptr types for cc's CSS animation classes
(Reverting as it seemed to cause build errors on Win Builder (dbg))
Rerelanding https://codereview.chromium.org/11085029/
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11091057
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/11092097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings/WebTransformAnimationCurveImpl.h')
| -rw-r--r-- | webkit/compositor_bindings/WebTransformAnimationCurveImpl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h index 88f1c3e..8631ef9 100644 --- a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h +++ b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h @@ -5,8 +5,9 @@ #ifndef WebTransformAnimationCurveImpl_h #define WebTransformAnimationCurveImpl_h -#include "base/memory/scoped_ptr.h" #include <public/WebTransformAnimationCurve.h> +#include <wtf/OwnPtr.h> +#include <wtf/PassOwnPtr.h> namespace cc { class CCAnimationCurve; @@ -30,10 +31,10 @@ public: virtual WebTransformationMatrix getValue(double time) const OVERRIDE; - scoped_ptr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const; + PassOwnPtr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const; private: - scoped_ptr<cc::CCKeyframedTransformAnimationCurve> m_curve; + OwnPtr<cc::CCKeyframedTransformAnimationCurve> m_curve; }; } |