| Index: cc/layer_tree_host_impl.cc
|
| diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
|
| index 6b984a74e0de1824c67b900fa28d33b669000fe3..3da5b45161f031e792fc85734f70891cab7c5305 100644
|
| --- a/cc/layer_tree_host_impl.cc
|
| +++ b/cc/layer_tree_host_impl.cc
|
| @@ -837,13 +837,13 @@ bool CCLayerTreeHostImpl::initializeRenderer(scoped_ptr<CCGraphicsContext> conte
|
| }
|
| // Note: order is important here.
|
| m_renderer.reset();
|
| - m_resourceProvider.clear();
|
| + m_resourceProvider.reset();
|
| m_context.reset();
|
|
|
| if (!context->bindToClient(this))
|
| return false;
|
|
|
| - OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(context.get());
|
| + scoped_ptr<CCResourceProvider> resourceProvider = CCResourceProvider::create(context.get());
|
| if (!resourceProvider)
|
| return false;
|
|
|
| @@ -854,7 +854,7 @@ bool CCLayerTreeHostImpl::initializeRenderer(scoped_ptr<CCGraphicsContext> conte
|
| if (!m_renderer)
|
| return false;
|
|
|
| - m_resourceProvider = resourceProvider.release();
|
| + m_resourceProvider = resourceProvider.Pass();
|
| m_context = context.Pass();
|
|
|
| if (!m_visible)
|
|
|