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

Unified Diff: cc/CCLayerTreeHostImpl.cpp

Issue 11076013: [cc] Store CCLayerImpls as scoped_ptrs (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
Index: cc/CCLayerTreeHostImpl.cpp
diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp
index 6f7d3239b2a942b4542773c38ed83ca83edd8560..fdf308cbc7ab1850c50b329ccdd2b13a7c7a31cc 100644
--- a/cc/CCLayerTreeHostImpl.cpp
+++ b/cc/CCLayerTreeHostImpl.cpp
@@ -678,9 +678,9 @@ static CCLayerImpl* findScrollLayerForContentLayer(CCLayerImpl* layerImpl)
return 0;
}
-void CCLayerTreeHostImpl::setRootLayer(PassOwnPtr<CCLayerImpl> layer)
+void CCLayerTreeHostImpl::setRootLayer(scoped_ptr<CCLayerImpl> layer)
{
- m_rootLayerImpl = layer;
+ m_rootLayerImpl = layer.Pass();
m_rootScrollLayerImpl = findRootScrollLayer(m_rootLayerImpl.get());
m_currentlyScrollingLayerImpl = 0;
@@ -692,14 +692,14 @@ void CCLayerTreeHostImpl::setRootLayer(PassOwnPtr<CCLayerImpl> layer)
m_client->onCanDrawStateChanged(canDraw());
}
-PassOwnPtr<CCLayerImpl> CCLayerTreeHostImpl::detachLayerTree()
+scoped_ptr<CCLayerImpl> CCLayerTreeHostImpl::detachLayerTree()
{
// Clear all data structures that have direct references to the layer tree.
m_scrollingLayerIdFromPreviousTree = m_currentlyScrollingLayerImpl ? m_currentlyScrollingLayerImpl->id() : -1;
m_currentlyScrollingLayerImpl = 0;
m_renderSurfaceLayerList.clear();
- return m_rootLayerImpl.release();
+ return m_rootLayerImpl.Pass();
}
void CCLayerTreeHostImpl::setVisible(bool visible)

Powered by Google App Engine
This is Rietveld 408576698