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

Unified Diff: cc/texture_update_controller.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
« cc/proxy.h ('K') | « cc/software_renderer.cc ('k') | cc/thread_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_update_controller.cc
diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc
index 59781c90d0173ce48c5aeb8da2babbf2826aff70..80db40fd6d5c45ba9c35cad6a0232c38643c0fa9 100644
--- a/cc/texture_update_controller.cc
+++ b/cc/texture_update_controller.cc
@@ -126,10 +126,11 @@ void CCTextureUpdateController::updateTexture(ResourceUpdate update)
DCHECK(m_resourceProvider->resourceType(texture->resourceId()) ==
CCResourceProvider::GLTexture);
- WebGraphicsContext3D* paintContext = CCProxy::hasImplThread() ?
+ bool hasImplThread = m_resourceProvider->proxy()->hasImplThread();
+ WebGraphicsContext3D* paintContext = hasImplThread ?
WebSharedGraphicsContext3D::compositorThreadContext() :
WebSharedGraphicsContext3D::mainThreadContext();
- GrContext* paintGrContext = CCProxy::hasImplThread() ?
+ GrContext* paintGrContext = hasImplThread ?
WebSharedGraphicsContext3D::compositorThreadGrContext() :
WebSharedGraphicsContext3D::mainThreadGrContext();
« cc/proxy.h ('K') | « cc/software_renderer.cc ('k') | cc/thread_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698