Index: cc/resource_update_controller.cc |
=================================================================== |
--- cc/resource_update_controller.cc (revision 165906) |
+++ cc/resource_update_controller.cc (working copy) |
@@ -8,6 +8,7 @@ |
#include "base/debug/trace_event.h" |
#include "cc/prioritized_texture.h" |
+#include "cc/proxy.h" |
#include "cc/resource_provider.h" |
#include "cc/texture_copier.h" |
#include "cc/thread.h" |
@@ -66,9 +67,8 @@ |
return texturesPerTick ? texturesPerTick : 1; |
} |
-ResourceUpdateController::ResourceUpdateController(ResourceUpdateControllerClient* client, Thread* thread, scoped_ptr<ResourceUpdateQueue> queue, ResourceProvider* resourceProvider, bool hasImplThread) |
+ResourceUpdateController::ResourceUpdateController(ResourceUpdateControllerClient* client, Thread* thread, scoped_ptr<ResourceUpdateQueue> queue, ResourceProvider* resourceProvider) |
: m_client(client) |
- , m_hasImplThread(hasImplThread) |
, m_queue(queue.Pass()) |
, m_resourceProvider(resourceProvider) |
, m_textureUpdatesPerTick(maxFullUpdatesPerTick(resourceProvider)) |
@@ -128,10 +128,10 @@ |
DCHECK(m_resourceProvider->resourceType(texture->resourceId()) == |
ResourceProvider::GLTexture); |
- WebGraphicsContext3D* paintContext = m_hasImplThread ? |
+ WebGraphicsContext3D* paintContext = Proxy::hasImplThread() ? |
WebSharedGraphicsContext3D::compositorThreadContext() : |
WebSharedGraphicsContext3D::mainThreadContext(); |
- GrContext* paintGrContext = m_hasImplThread ? |
+ GrContext* paintGrContext = Proxy::hasImplThread() ? |
WebSharedGraphicsContext3D::compositorThreadGrContext() : |
WebSharedGraphicsContext3D::mainThreadGrContext(); |