| Index: cc/CCLayerTreeHostImpl.cpp
|
| diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp
|
| index 1f7638f5cef54ff83948313114c7a33d8b1f4048..d75c240b81cd3597fdda0063cfcfceedbb5a316c 100644
|
| --- a/cc/CCLayerTreeHostImpl.cpp
|
| +++ b/cc/CCLayerTreeHostImpl.cpp
|
| @@ -786,9 +786,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;
|
|
|
| @@ -800,14 +800,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)
|
|
|