Index: cc/CCLayerTreeHostImpl.cpp |
diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp |
index e89811afc52755c80f56b33e235f8a0964bb8c3e..d2e4b7e9fe25e2c615047106800c0876a4987258 100644 |
--- a/cc/CCLayerTreeHostImpl.cpp |
+++ b/cc/CCLayerTreeHostImpl.cpp |
@@ -678,9 +678,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; |
@@ -692,14 +692,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) |