diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 12:52:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 12:52:45 +0000 |
| commit | 0023e8b1d2b5cf906e320267ab38d909b1700660 (patch) | |
| tree | 900c4abd1b01a9e7b36a6f861d34f3003232aeb7 /cc/page_scale_animation.h | |
| parent | e5c7a6d470fe15744cf13c0cddf30da19421cdbb (diff) | |
| download | chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.zip chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.tar.gz chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.tar.bz2 | |
cc: Remove OwnPtr from CCFrameRateCounter.
Instead use scoped_ptr from base/ library.
BUG=154451
R=enne@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/11150007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/page_scale_animation.h')
| -rw-r--r-- | cc/page_scale_animation.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/page_scale_animation.h b/cc/page_scale_animation.h index f597026..a3634f3 100644 --- a/cc/page_scale_animation.h +++ b/cc/page_scale_animation.h @@ -5,8 +5,8 @@ #ifndef CCPageScaleAnimation_h #define CCPageScaleAnimation_h +#include "base/memory/scoped_ptr.h" #include "IntSize.h" -#include <wtf/PassOwnPtr.h> namespace cc { @@ -19,7 +19,7 @@ public: // Construct with the starting page scale and scroll offset (which is in // pageScaleStart space). The window size is the user-viewable area // in pixels. - static PassOwnPtr<CCPageScaleAnimation> create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime); + static scoped_ptr<CCPageScaleAnimation> create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime); // The following methods initialize the animation. Call one of them // immediately after construction to set the final scroll and page scale. @@ -69,6 +69,6 @@ private: double m_duration; }; -} // namespace cc +} // namespace cc #endif |