| Index: cc/CCLayerTreeHostImpl.h
|
| diff --git a/cc/CCLayerTreeHostImpl.h b/cc/CCLayerTreeHostImpl.h
|
| index 785464d3d171eafbd7c23ee03e37074d21bfb5a4..6aff61d635143a1709ca5794808d08a2bade53cc 100644
|
| --- a/cc/CCLayerTreeHostImpl.h
|
| +++ b/cc/CCLayerTreeHostImpl.h
|
| @@ -123,7 +123,7 @@ public:
|
|
|
| void readback(void* pixels, const IntRect&);
|
|
|
| - void setRootLayer(PassOwnPtr<CCLayerImpl>);
|
| + void setRootLayer(scoped_ptr<CCLayerImpl>);
|
| CCLayerImpl* rootLayer() { return m_rootLayerImpl.get(); }
|
|
|
| void setHudLayer(CCHeadsUpDisplayLayerImpl* layerImpl) { m_hudLayerImpl = layerImpl; }
|
| @@ -131,7 +131,7 @@ public:
|
|
|
| // Release ownership of the current layer tree and replace it with an empty
|
| // tree. Returns the root layer of the detached tree.
|
| - PassOwnPtr<CCLayerImpl> detachLayerTree();
|
| + scoped_ptr<CCLayerImpl> detachLayerTree();
|
|
|
| CCLayerImpl* rootScrollLayer() const { return m_rootScrollLayerImpl; }
|
|
|
| @@ -253,7 +253,7 @@ private:
|
| scoped_ptr<CCGraphicsContext> m_context;
|
| OwnPtr<CCResourceProvider> m_resourceProvider;
|
| OwnPtr<CCRenderer> m_renderer;
|
| - OwnPtr<CCLayerImpl> m_rootLayerImpl;
|
| + scoped_ptr<CCLayerImpl> m_rootLayerImpl;
|
| CCLayerImpl* m_rootScrollLayerImpl;
|
| CCLayerImpl* m_currentlyScrollingLayerImpl;
|
| CCHeadsUpDisplayLayerImpl* m_hudLayerImpl;
|
|
|