InProcessGL: Share MailboxManager per service

android_webview/browser/hardware_renderer.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 "android_webview/browser/hardware_renderer.h"
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/parent_output_surface.h"
 #include "android_webview/browser/shared_renderer_state.h"
@@ skipping 20 matching lines @@
 
 namespace android_webview {
 
 namespace {
 
 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
 using webkit::gpu::WebGraphicsContext3DImpl;
 
 scoped_refptr<cc::ContextProvider> CreateContext(
     scoped_refptr<gfx::GLSurface> surface,
-    scoped_refptr<gpu::InProcessCommandBuffer::Service> service,
-    gpu::GLInProcessContext* share_context) {
+    scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
 
   blink::WebGraphicsContext3D::Attributes attributes;
   attributes.antialias = false;
   attributes.depth = false;
   attributes.stencil = false;
   attributes.shareResources = true;
   attributes.noAutomaticFlushes = true;
   gpu::gles2::ContextCreationAttribHelper attribs_for_gles2;
   WebGraphicsContext3DImpl::ConvertAttributes(
       attributes, &attribs_for_gles2);
   attribs_for_gles2.lose_context_when_out_of_memory = true;
 
   scoped_ptr<gpu::GLInProcessContext> context(gpu::GLInProcessContext::Create(
       service,
       surface,
       surface->IsOffscreen(),
       gfx::kNullAcceleratedWidget,
       surface->GetSize(),
-      share_context,
+      NULL /* share_context */,
       false /* share_resources */,
       attribs_for_gles2,
       gpu_preference,
       gpu::GLInProcessContextSharedMemoryLimits()));
   DCHECK(context.get());
 
   return webkit::gpu::ContextProviderInProcess::Create(
       WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext(
           context.Pass(), attributes),
       "Parent-Compositor");
@@ skipping 162 matching lines @@
   }
   gl_surface_->ResetBackingFrameBufferObject();
 }
 
 scoped_ptr<cc::OutputSurface> HardwareRenderer::CreateOutputSurface(
     bool fallback) {
   // Android webview does not support losing output surface.
   DCHECK(!fallback);
   scoped_refptr<cc::ContextProvider> context_provider =
       CreateContext(gl_surface_,
-                    DeferredGpuCommandService::GetInstance(),
-                    shared_renderer_state_->GetSharedContext());
+                    DeferredGpuCommandService::GetInstance());
   scoped_ptr<ParentOutputSurface> output_surface_holder(
       new ParentOutputSurface(context_provider));
   output_surface_ = output_surface_holder.get();
   return output_surface_holder.PassAs<cc::OutputSurface>();
 }
 
 void HardwareRenderer::UnusedResourcesAreAvailable() {
   cc::ReturnedResourceArray returned_resources;
   resource_collection_->TakeUnusedResourcesForChildCompositor(
       &returned_resources);
   shared_renderer_state_->InsertReturnedResources(returned_resources);
 }
 
 }  // namespace android_webview