| Index: cc/texture_update_controller.cc
|
| diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc
|
| index b0f1ccbb811238fc761412b27ec68bd26de71fa1..ff66246735f715de372435c7db3d5c993e2fdc30 100644
|
| --- a/cc/texture_update_controller.cc
|
| +++ b/cc/texture_update_controller.cc
|
| @@ -8,7 +8,6 @@
|
|
|
| #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 "third_party/khronos/GLES2/gl2.h"
|
| @@ -70,8 +69,9 @@ size_t TextureUpdateController::maxFullUpdatesPerTick(
|
| return texturesPerTick ? texturesPerTick : 1;
|
| }
|
|
|
| -TextureUpdateController::TextureUpdateController(TextureUpdateControllerClient* client, Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider)
|
| +TextureUpdateController::TextureUpdateController(TextureUpdateControllerClient* client, Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider, bool hasImplThread)
|
| : m_client(client)
|
| + , m_hasImplThread(hasImplThread)
|
| , m_timer(new Timer(thread, this))
|
| , m_queue(queue.Pass())
|
| , m_resourceProvider(resourceProvider)
|
| @@ -126,10 +126,10 @@ void TextureUpdateController::updateTexture(ResourceUpdate update)
|
| DCHECK(m_resourceProvider->resourceType(texture->resourceId()) ==
|
| ResourceProvider::GLTexture);
|
|
|
| - WebGraphicsContext3D* paintContext = Proxy::hasImplThread() ?
|
| + WebGraphicsContext3D* paintContext = m_hasImplThread ?
|
| WebSharedGraphicsContext3D::compositorThreadContext() :
|
| WebSharedGraphicsContext3D::mainThreadContext();
|
| - GrContext* paintGrContext = Proxy::hasImplThread() ?
|
| + GrContext* paintGrContext = m_hasImplThread ?
|
| WebSharedGraphicsContext3D::compositorThreadGrContext() :
|
| WebSharedGraphicsContext3D::mainThreadGrContext();
|
|
|
|
|