Move InitializeOnCurrentThread down from WebGraphicsContext3DImpl to WebGraphicsContext3DCommandBuf…

content/renderer/renderer_webkitplatformsupport_impl.cc

 // Copyright (c) 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 "content/renderer/renderer_webkitplatformsupport_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 63 matching lines @@
 #include "third_party/WebKit/public/platform/WebPluginListBuilder.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "ui/gfx/color_profile.h"
 #include "url/gurl.h"
 #include "webkit/common/gpu/context_provider_web_context.h"
 
 #if defined(OS_ANDROID)
 #include "content/renderer/android/synchronous_compositor_factory.h"
 #include "content/renderer/media/android/audio_decoder_android.h"
+#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "content/common/mac/font_descriptor.h"
 #include "content/common/mac/font_loader.h"
 #include "content/renderer/webscrollbarbehavior_impl_mac.h"
 #include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h"
 #endif
 
 #if defined(OS_POSIX)
@@ skipping 851 matching lines @@
   return createOffscreenGraphicsContext3D(attributes, NULL);
 }
 
 blink::WebGraphicsContext3D*
 RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D(
     const blink::WebGraphicsContext3D::Attributes& attributes,
     blink::WebGraphicsContext3D* share_context) {
   if (!RenderThreadImpl::current())
     return NULL;
 
-  scoped_ptr<webkit::gpu::WebGraphicsContext3DImpl> context;
-  bool must_use_synchronous_factory = false;
 #if defined(OS_ANDROID)
+  scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl>
+    context;
   if (SynchronousCompositorFactory* factory =
           SynchronousCompositorFactory::GetInstance()) {
     context.reset(factory->CreateOffscreenGraphicsContext3D(attributes));
-    must_use_synchronous_factory = true;
   }

[jamesr, 2014/09/29 18:00:57]

this is not correct.

in the previous code on OS_ANDROID if
SynchronousCompositorFactory::GetInstance() returns NULL then the code falls
through and initializes the context using WGC3DCBI::CreateOffscreenContext().

With your patch, on android the *only* way to get an actual context is via
SynchronousCompositorFactory, which is only set for android_webview, so this
patch will (in practice) disable webgl completely for Chrome on android.

+#else
+  scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context;
+  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)));
 #endif
-  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();
 }
 
 //------------------------------------------------------------------------------
 
 blink::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl::
@@ skipping 193 matching lines @@
 void RendererWebKitPlatformSupportImpl::MockBatteryStatusChangedForTesting(
     const blink::WebBatteryStatus& status) {
   PlatformEventObserverBase* observer =
       platform_event_observers_.Lookup(blink::WebPlatformEventBattery);
   if (!observer)
     return;
   observer->SendFakeDataForTesting((void*)&status);
 }
 
 }  // namespace content