Share SyncPointManager between ipc and in-process

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 "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/android/in_process/context_provider_in_process.h"
 #include "content/browser/android/in_process/synchronous_compositor_external_begin_frame_source.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
+#include "content/gpu/in_process_gpu_thread.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_surface_stub.h"
@@ skipping 137 matching lines @@
 SynchronousCompositorFactoryImpl::CreateExternalBeginFrameSource(
     int routing_id) {
   return make_scoped_ptr(
              new SynchronousCompositorExternalBeginFrameSource(routing_id));
 }
 
 scoped_refptr<ContextProviderWebContext>
 SynchronousCompositorFactoryImpl::CreateOffscreenContextProvider(
     const blink::WebGraphicsContext3D::Attributes& attributes,
     const std::string& debug_name) {
-  ContextHolder holder = CreateContextHolder(
-      attributes, nullptr, gpu::GLInProcessContextSharedMemoryLimits(), true);
+  ContextHolder holder =
+      CreateContextHolder(attributes, GpuThreadService(),
+                          gpu::GLInProcessContextSharedMemoryLimits(), true);
   return ContextProviderInProcess::Create(holder.command_buffer.Pass(),
                                           debug_name);
 }
 
 scoped_refptr<cc::ContextProvider>
 SynchronousCompositorFactoryImpl::CreateContextProviderForCompositor() {
   blink::WebGraphicsContext3D::Attributes attributes = GetDefaultAttribs();
   gpu::GLInProcessContextSharedMemoryLimits mem_limits;
   // This is half of what RenderWidget uses because synchronous compositor
   // pipeline is only one frame deep.
   if (base::SysInfo::IsLowEndDevice()) {
     // But twice of half here because 16bit texture is not supported.
     mem_limits.mapped_memory_reclaim_limit = 2 * 1024 * 1024;
   } else {
     mem_limits.mapped_memory_reclaim_limit = 6 * 1024 * 1024;
   }
   ContextHolder holder =
-      CreateContextHolder(attributes, nullptr, mem_limits, true);
+      CreateContextHolder(attributes, GpuThreadService(), mem_limits, true);
   return ContextProviderInProcess::Create(holder.command_buffer.Pass(),
                                           "Child-Compositor");
 }
 
 scoped_refptr<StreamTextureFactory>
 SynchronousCompositorFactoryImpl::CreateStreamTextureFactory(int frame_id) {
   scoped_refptr<StreamTextureFactorySynchronousImpl> factory(
       StreamTextureFactorySynchronousImpl::Create(
           base::Bind(
               &SynchronousCompositorFactoryImpl::TryCreateStreamTextureFactory,
               base::Unretained(this)),
           frame_id));
   return factory;
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl*
 SynchronousCompositorFactoryImpl::CreateOffscreenGraphicsContext3D(
     const blink::WebGraphicsContext3D::Attributes& attributes) {
-  ContextHolder holder = CreateContextHolder(
-                         attributes, nullptr,
-                         gpu::GLInProcessContextSharedMemoryLimits(), true);
+  ContextHolder holder =
+      CreateContextHolder(attributes, GpuThreadService(),
+                          gpu::GLInProcessContextSharedMemoryLimits(), true);
   return holder.command_buffer.release();
 }
 
 gpu::GPUInfo SynchronousCompositorFactoryImpl::GetGPUInfo() const {
   return content::GpuDataManager::GetInstance()->GetGPUInfo();
 }
 
 void SynchronousCompositorFactoryImpl::CompositorInitializedHardwareDraw() {
   base::AutoLock lock(num_hardware_compositor_lock_);
   num_hardware_compositors_++;
@@ skipping 32 matching lines @@
   // Always fail creation even if |video_context_provider_| is not NULL.
   // This is to avoid synchronous calls that may deadlock. Setting
   // |video_context_provider_| to null is also not safe since it makes
   // synchronous destruction uncontrolled and possibly deadlock.
   if (!CanCreateMainThreadContext()) {
     return
         scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>();
   }
 
   if (!video_context_provider_.get()) {
-    DCHECK(service_.get());
+    DCHECK(android_view_service_.get());
 
     blink::WebGraphicsContext3D::Attributes attributes = GetDefaultAttribs();
     attributes.shareResources = false;
-    // This needs to run in on-screen |service_| context due to SurfaceTexture
-    // limitations.
+    // This needs to run in on-screen |android_view_service_| context due to
+    // SurfaceTexture limitations.
     ContextHolder holder =
-        CreateContextHolder(attributes, service_,
+        CreateContextHolder(attributes, android_view_service_,
                             gpu::GLInProcessContextSharedMemoryLimits(), false);
     video_context_provider_ = new VideoContextProvider(
         ContextProviderInProcess::Create(holder.command_buffer.Pass(),
                                          "Video-Offscreen-main-thread"),
         holder.gl_in_process_context);
   }
   return video_context_provider_;
 }
 
 void SynchronousCompositorFactoryImpl::SetDeferredGpuService(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
-  DCHECK(!service_.get());
-  service_ = service;
+  DCHECK(!android_view_service_.get());
+  android_view_service_ = service;
+}
+
+base::Thread* SynchronousCompositorFactoryImpl::CreateInProcessGpuThread(
+    const InProcessChildThreadParams& params) {
+  DCHECK(android_view_service_.get());
+  return new InProcessGpuThread(params,
+                                android_view_service_->sync_point_manager());
+}
+
+scoped_refptr<gpu::InProcessCommandBuffer::Service>
+SynchronousCompositorFactoryImpl::GpuThreadService() {
+  DCHECK(android_view_service_.get());
+  // Create thread lazily on first use.
+  if (!gpu_thread_service_.get()) {
+    gpu_thread_service_ = new gpu::GpuInProcessThread(
+        android_view_service_->sync_point_manager());
+  }
+  return gpu_thread_service_;
 }
 
 void SynchronousCompositorFactoryImpl::SetRecordFullDocument(
     bool record_full_document) {
   record_full_layer_ = record_full_document;
 }
 
 }  // namespace content