cc: Route offscreen context creation for compositor to the browser.

cc/resource_update_controller.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resource_update_controller.h"
 
 #include <limits>
 
 #include "base/debug/trace_event.h"
 #include "cc/prioritized_resource.h"
 #include "cc/resource_provider.h"
 #include "cc/texture_copier.h"
 #include "cc/thread.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
 
 using WebKit::WebGraphicsContext3D;
-using WebKit::WebSharedGraphicsContext3D;
 
 namespace {
 
 // Number of partial updates we allow.
 const size_t partialTextureUpdatesMax = 12;
 
 // Measured in seconds.
 const double textureUpdateTickRate = 0.004;
 
 // Measured in seconds.
@@ skipping 85 matching lines @@
 }
 
 void ResourceUpdateController::updateTexture(ResourceUpdate update)
 {
     if (update.picture) {
         PrioritizedResource* texture = update.texture;
         gfx::Rect pictureRect = update.content_rect;
         gfx::Rect sourceRect = update.source_rect;
         gfx::Vector2d destOffset = update.dest_offset;
 
+        WebGraphicsContext3D* paintContext = m_resourceProvider->offscreenGraphicsContext3d();
+        if (!paintContext)
+            return;
+
+        GrContext* paintGrContext = m_resourceProvider->offscreenGrContext();
+        if (!paintGrContext)
+            return;
+
         texture->acquireBackingTexture(m_resourceProvider);
         DCHECK(texture->haveBackingTexture());
 
         DCHECK(m_resourceProvider->resourceType(texture->resourceId()) ==
                ResourceProvider::GLTexture);
 
-        WebGraphicsContext3D* paintContext = m_hasImplThread ?
-            WebSharedGraphicsContext3D::compositorThreadContext() :
-            WebSharedGraphicsContext3D::mainThreadContext();
-        GrContext* paintGrContext = m_hasImplThread ?
-            WebSharedGraphicsContext3D::compositorThreadGrContext() :
-            WebSharedGraphicsContext3D::mainThreadGrContext();
-
         // Flush the context in which the backing texture is created so that it
         // is available in other shared contexts. It is important to do here
         // because the backing texture is created in one context while it is
         // being written to in another.
         ResourceProvider::ScopedWriteLockGL lock(
             m_resourceProvider, texture->resourceId());
         m_resourceProvider->flush();
 
         // Make sure ganesh uses the correct GL context.
         paintContext->makeContextCurrent();
@@ skipping 133 matching lines @@
     if (!uploads)
         return;
 
     while (m_queue->fullUploadSize() && uploads--)
         updateTexture(m_queue->takeFirstFullUpload());
 
     m_resourceProvider->flushUploads();
 }
 
 }  // namespace cc