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

Unified Diff: cc/CCLayerTreeHostImpl.cpp

Issue 11083003: Revert 160631 - [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
« 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
===================================================================
--- cc/CCLayerTreeHostImpl.cpp (revision 160631)
+++ cc/CCLayerTreeHostImpl.cpp (working copy)
@@ -678,9 +678,9 @@
return 0;
}
-void CCLayerTreeHostImpl::setRootLayer(scoped_ptr<CCLayerImpl> layer)
+void CCLayerTreeHostImpl::setRootLayer(PassOwnPtr<CCLayerImpl> layer)
{
- m_rootLayerImpl = layer.Pass();
+ m_rootLayerImpl = layer;
m_rootScrollLayerImpl = findRootScrollLayer(m_rootLayerImpl.get());
m_currentlyScrollingLayerImpl = 0;
@@ -692,14 +692,14 @@
m_client->onCanDrawStateChanged(canDraw());
}
-scoped_ptr<CCLayerImpl> CCLayerTreeHostImpl::detachLayerTree()
+PassOwnPtr<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.Pass();
+ return m_rootLayerImpl.release();
}
void CCLayerTreeHostImpl::setVisible(bool visible)
« 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