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.cc | |
| 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.cc')
| -rw-r--r-- | cc/page_scale_animation.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cc/page_scale_animation.cc b/cc/page_scale_animation.cc index 12dda09..7a7ebfe 100644 --- a/cc/page_scale_animation.cc +++ b/cc/page_scale_animation.cc @@ -13,12 +13,11 @@ namespace cc { -PassOwnPtr<CCPageScaleAnimation> CCPageScaleAnimation::create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime) +scoped_ptr<CCPageScaleAnimation> CCPageScaleAnimation::create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime) { - return adoptPtr(new CCPageScaleAnimation(scrollStart, pageScaleStart, windowSize, contentSize, startTime)); + return make_scoped_ptr(new CCPageScaleAnimation(scrollStart, pageScaleStart, windowSize, contentSize, startTime)); } - CCPageScaleAnimation::CCPageScaleAnimation(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime) : m_scrollStart(scrollStart) , m_pageScaleStart(pageScaleStart) @@ -156,4 +155,4 @@ float CCPageScaleAnimation::pageScaleAtRatio(float ratio) const return m_pageScaleStart * diff; } -} // namespace cc +} // namespace cc |