| 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)
|
|
|