Support multiple service instances with GLInProcessContext

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

 // Copyright 2014 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/browser/android/in_process/synchronous_compositor_factory_impl.h"
 
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "ui/gl/android/surface_texture.h"
@@ skipping 33 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(VideoContextProvider);
 };
 
 }  // namespace
 
 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
 
 SynchronousCompositorFactoryImpl::SynchronousCompositorFactoryImpl()
     : wrapped_gl_context_for_main_thread_(NULL),
+      wrapped_gl_context_for_compositor_thread_(NULL),
       num_hardware_compositors_(0) {
   SynchronousCompositorFactory::SetInstance(this);
 }
 
 SynchronousCompositorFactoryImpl::~SynchronousCompositorFactoryImpl() {}
 
 scoped_refptr<base::MessageLoopProxy>
 SynchronousCompositorFactoryImpl::GetCompositorMessageLoop() {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
 }
@@ skipping 12 matching lines @@
 
 scoped_refptr<ContextProviderWebContext>
 SynchronousCompositorFactoryImpl::GetOffscreenContextProviderForMainThread() {
   // This check only guarantees the main thread context is created after
   // a compositor did successfully initialize hardware draw in the past.
   // In particular this does not guarantee that the main thread context
   // will fail creation when all compositors release hardware draw.
   bool failed = false;
   if ((!offscreen_context_for_main_thread_.get() ||
        offscreen_context_for_main_thread_->DestroyedOnMainThread())) {
+    scoped_ptr<gpu::GLInProcessContext> context = CreateOffscreenContext();
+    wrapped_gl_context_for_main_thread_ = context.get();
     offscreen_context_for_main_thread_ =
         webkit::gpu::ContextProviderInProcess::Create(
-            CreateOffscreenContext(),
-            "Compositor-Offscreen");
+            WrapContext(context.Pass()),
+            "Compositor-Offscreen-main-thread");
     failed = !offscreen_context_for_main_thread_.get() ||
              !offscreen_context_for_main_thread_->BindToCurrentThread();
   }
 
   if (failed) {
     offscreen_context_for_main_thread_ = NULL;
     wrapped_gl_context_for_main_thread_ = NULL;
   }
   return offscreen_context_for_main_thread_;
 }
 
 // This is called on both renderer main thread (offscreen context creation
 // path shared between cross-process and in-process platforms) and renderer
 // compositor impl thread (InitializeHwDraw) in order to support Android
 // WebView synchronously enable and disable hardware mode multiple times in
 // the same task. This is ok because in-process WGC3D creation may happen on
 // any thread and is lightweight.
 scoped_refptr<cc::ContextProvider> SynchronousCompositorFactoryImpl::
     GetOffscreenContextProviderForCompositorThread() {
   base::AutoLock lock(offscreen_context_for_compositor_thread_lock_);
   if (!offscreen_context_for_compositor_thread_.get() ||
       offscreen_context_for_compositor_thread_->DestroyedOnMainThread()) {
+    scoped_ptr<gpu::GLInProcessContext> context = CreateOffscreenContext();
+    wrapped_gl_context_for_compositor_thread_ = context.get();
     offscreen_context_for_compositor_thread_ =
-        webkit::gpu::ContextProviderInProcess::CreateOffscreen();
+        webkit::gpu::ContextProviderInProcess::Create(
+            WrapContext(context.Pass()),
+            "Compositor-Offscreen-compositor-thread");
+    failed = !offscreen_context_for_compositor_thread_.get() ||
+             !offscreen_context_for_compositor_thread_->BindToCurrentThread();
+  }
+  if (failed) {
+    offscreen_context_for_compositor_thread_ = NULL;
+    wrapped_gl_context_for_compositor_thread_ = NULL;
   }
   return offscreen_context_for_compositor_thread_;
 }
 
 scoped_ptr<StreamTextureFactory>
 SynchronousCompositorFactoryImpl::CreateStreamTextureFactory(int view_id) {
   scoped_ptr<StreamTextureFactorySynchronousImpl> factory(
       new StreamTextureFactorySynchronousImpl(
           base::Bind(&SynchronousCompositorFactoryImpl::
                           TryCreateStreamTextureFactory,
@@ skipping 47 matching lines @@
                                  wrapped_gl_context_for_main_thread_);
   }
   return context_provider;
 }
 
 // TODO(boliu): Deduplicate this with synchronous_compositor_output_surface.cc.
 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
 SynchronousCompositorFactoryImpl::CreateOffscreenContext() {
   const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
 
-  blink::WebGraphicsContext3D::Attributes attributes;
-  attributes.antialias = false;
-  attributes.shareResources = true;
-  attributes.noAutomaticFlushes = true;
-
   gpu::GLInProcessContextAttribs in_process_attribs;
   WebGraphicsContext3DInProcessCommandBufferImpl::ConvertAttributes(
       attributes, &in_process_attribs);
   scoped_ptr<gpu::GLInProcessContext> context(
       gpu::GLInProcessContext::CreateContext(true,
                                              NULL,
                                              gfx::Size(1, 1),
-                                             attributes.shareResources,
+                                             true /* share_resources */,
                                              in_process_attribs,
                                              gpu_preference));
+  return context.Pass();
+}
 
-  wrapped_gl_context_for_main_thread_ = context.get();
+scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
+SynchronousCompositorFactoryImpl::WrapContext(
+    scoped_ptr<gpu::GLInProcessContext> context) {
   if (!context.get())
     return scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>();
 
+  blink::WebGraphicsContext3D::Attributes attributes;
+  attributes.antialias = false;
+  attributes.shareResources = true;
+  attributes.noAutomaticFlushes = true;
+
   return scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>(
       WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext(
           context.Pass(), attributes));
 }
 
 }  // namespace content