gpu: Remove WebGraphicsContext3D::makeContextCurrent()

content/renderer/renderer_webkitplatformsupport_impl.cc

Index: content/renderer/renderer_webkitplatformsupport_impl.cc
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index dd0c3c12bf44d6b6a8be0b4f6e05e99786129b7d..b340b7cdd3bc95e758c196ccc64f7e502d09ee38 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -953,26 +953,35 @@ RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D(
   if (!RenderThreadImpl::current())
     return NULL;
 
+  scoped_ptr<webkit::gpu::WebGraphicsContext3DImpl> context;
+  bool must_use_synchronous_factory = false;

[dshwang, 2014/08/29 07:06:35]

Introduce this local variable, because Android webview must not call
RenderThreadImpl::current()->EstablishGpuChannelSync(...) although creation by
SynchronousCompositorFactory fails.

 #if defined(OS_ANDROID)
   if (SynchronousCompositorFactory* factory =
           SynchronousCompositorFactory::GetInstance()) {
-    return factory->CreateOffscreenGraphicsContext3D(attributes);
+    context.reset(factory->CreateOffscreenGraphicsContext3D(attributes));
+    must_use_synchronous_factory = true;
   }
 #endif
-
-  scoped_refptr<GpuChannelHost> gpu_channel_host(
-      RenderThreadImpl::current()->EstablishGpuChannelSync(
-          CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE));
-
-  WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits limits;
-  bool lose_context_when_out_of_memory = false;
-  return WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
-      gpu_channel_host.get(),
-      attributes,
-      lose_context_when_out_of_memory,
-      GURL(attributes.topDocumentURL),
-      limits,
-      static_cast<WebGraphicsContext3DCommandBufferImpl*>(share_context));
+  if (!must_use_synchronous_factory) {
+    scoped_refptr<GpuChannelHost> gpu_channel_host(
+        RenderThreadImpl::current()->EstablishGpuChannelSync(
+            CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE));
+
+    WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits limits;
+    bool lose_context_when_out_of_memory = false;
+    context.reset(WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
+        gpu_channel_host.get(),
+        attributes,
+        lose_context_when_out_of_memory,
+        GURL(attributes.topDocumentURL),
+        limits,
+        static_cast<WebGraphicsContext3DCommandBufferImpl*>(share_context)));
+  }
+  // Most likely the GPU process exited and the attempt to reconnect to it
+  // failed. Need to try to restore the context again later.
+  if (!context || !context->InitializeOnCurrentThread())
+    return NULL;
+  return context.release();
 }
 
 //------------------------------------------------------------------------------