Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2475)

Unified Diff: cc/layer_tree_host_impl.cc

Issue 11183006: cc: Remove wtf includes from resource provider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_tree_host_impl.h ('k') | cc/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « cc/layer_tree_host_impl.h ('k') | cc/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698