Support multiple service instances with GLInProcessContext

content/browser/android/in_process/synchronous_compositor_impl.cc

 // Copyright 2013 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_impl.h"
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/input/input_handler.h"
 #include "cc/input/layer_scroll_offset_delegate.h"
@@ skipping 64 matching lines @@
     compositor_client_->DidDestroyCompositor(this);
   SetInputHandler(NULL);
 }
 
 void SynchronousCompositorImpl::SetClient(
     SynchronousCompositorClient* compositor_client) {
   DCHECK(CalledOnValidThread());
   compositor_client_ = compositor_client;
 }
 
+// static
+void SynchronousCompositor::SetGpuService(
+    scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
+  g_factory.Get().SetDeferredGpuService(service);
+}
+
 bool SynchronousCompositorImpl::InitializeHwDraw(
     scoped_refptr<gfx::GLSurface> surface) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
-  bool success = output_surface_->InitializeHwDraw(
-      surface,
-      g_factory.Get().GetOffscreenContextProviderForCompositorThread());
+
+  // Create contexts in this order so that the share group gets passed
+  // along correctly.
+  scoped_refptr<cc::ContextProvider> offscreen_context =
+      g_factory.Get().GetOffscreenContextProviderForCompositorThread();
+  scoped_refptr<cc::ContextProvider> onscreen_context =
+  g_factory.Get().CreateOnscreenContextProviderForCompositorThread(surface);
+
+  bool success =
+      output_surface_->InitializeHwDraw(onscreen_context, offscreen_context);
+
   if (success)
     g_factory.Get().CompositorInitializedHardwareDraw();
   return success;
 }
 
 void SynchronousCompositorImpl::ReleaseHwDraw() {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
   output_surface_->ReleaseHwDraw();
   g_factory.Get().CompositorReleasedHardwareDraw();
@@ skipping 166 matching lines @@
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   if (SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents)) {
     instance->SetClient(client);
   }
 }
 
 }  // namespace content