Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: cc/CCLayerTreeHostImpl.cpp

Issue 11111003: cc: Convert processScrollDeltas() to scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCLayerTreeHostImpl.h ('k') | cc/CCLayerTreeHostImplTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHostImpl.cpp
diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp
index 02e3cd85ff3719f3320ebf77bf76a4e38bdce359..56043ee8f89bbb48064387f58d6ed78c93af99ce 100644
--- a/cc/CCLayerTreeHostImpl.cpp
+++ b/cc/CCLayerTreeHostImpl.cpp
@@ -1298,9 +1298,9 @@ static void collectScrollDeltas(CCScrollAndScaleSet* scrollInfo, CCLayerImpl* la
collectScrollDeltas(scrollInfo, layerImpl->children()[i]);
}
-PassOwnPtr<CCScrollAndScaleSet> CCLayerTreeHostImpl::processScrollDeltas()
+scoped_ptr<CCScrollAndScaleSet> CCLayerTreeHostImpl::processScrollDeltas()
{
- OwnPtr<CCScrollAndScaleSet> scrollInfo = adoptPtr(new CCScrollAndScaleSet());
+ scoped_ptr<CCScrollAndScaleSet> scrollInfo(new CCScrollAndScaleSet());
if (m_pinchGestureActive || m_pageScaleAnimation) {
scrollInfo->pageScaleDelta = 1;
@@ -1313,14 +1313,14 @@ PassOwnPtr<CCScrollAndScaleSet> CCLayerTreeHostImpl::processScrollDeltas()
else if (m_pageScaleAnimation.get())
computeDoubleTapZoomDeltas(scrollInfo.get());
}
- return scrollInfo.release();
+ return scrollInfo.Pass();
}
collectScrollDeltas(scrollInfo.get(), m_rootLayerImpl.get());
scrollInfo->pageScaleDelta = m_pinchZoomViewport.pageScaleDelta();
m_pinchZoomViewport.setSentPageScaleDelta(scrollInfo->pageScaleDelta);
- return scrollInfo.release();
+ return scrollInfo.Pass();
}
WebTransformationMatrix CCLayerTreeHostImpl::implTransform() const
« no previous file with comments | « cc/CCLayerTreeHostImpl.h ('k') | cc/CCLayerTreeHostImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698