From 0023e8b1d2b5cf906e320267ab38d909b1700660 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 15 Oct 2012 12:52:45 +0000 Subject: 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 --- cc/page_scale_animation.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cc/page_scale_animation.h') 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 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 create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime); + static scoped_ptr 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 -- cgit v1.1