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

Unified Diff: cc/CCLayerTreeHostImpl.h

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/CCLayerTreeHostCommonTest.cpp ('k') | cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHostImpl.h
===================================================================
--- cc/CCLayerTreeHostImpl.h (revision 160631)
+++ cc/CCLayerTreeHostImpl.h (working copy)
@@ -123,7 +123,7 @@
void readback(void* pixels, const IntRect&);
- void setRootLayer(scoped_ptr<CCLayerImpl>);
+ void setRootLayer(PassOwnPtr<CCLayerImpl>);
CCLayerImpl* rootLayer() { return m_rootLayerImpl.get(); }
void setHudLayer(CCHeadsUpDisplayLayerImpl* layerImpl) { m_hudLayerImpl = layerImpl; }
@@ -131,7 +131,7 @@
// Release ownership of the current layer tree and replace it with an empty
// tree. Returns the root layer of the detached tree.
- scoped_ptr<CCLayerImpl> detachLayerTree();
+ PassOwnPtr<CCLayerImpl> detachLayerTree();
CCLayerImpl* rootScrollLayer() const { return m_rootScrollLayerImpl; }
@@ -253,7 +253,7 @@
scoped_ptr<CCGraphicsContext> m_context;
OwnPtr<CCResourceProvider> m_resourceProvider;
OwnPtr<CCRenderer> m_renderer;
- scoped_ptr<CCLayerImpl> m_rootLayerImpl;
+ OwnPtr<CCLayerImpl> m_rootLayerImpl;
CCLayerImpl* m_rootScrollLayerImpl;
CCLayerImpl* m_currentlyScrollingLayerImpl;
CCHeadsUpDisplayLayerImpl* m_hudLayerImpl;
« no previous file with comments | « cc/CCLayerTreeHostCommonTest.cpp ('k') | cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698