Share SyncPointManager between ipc and in-process

components/view_manager/gles2/command_buffer_driver.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 "components/view_manager/gles2/command_buffer_driver.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "components/view_manager/gles2/command_buffer_type_conversions.h"
+#include "components/view_manager/gles2/gpu_state.h"
 #include "components/view_manager/gles2/mojo_buffer_backing.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/image_factory.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
@@ skipping 27 matching lines @@
   ~MemoryTrackerStub() override {}
 
   DISALLOW_COPY_AND_ASSIGN(MemoryTrackerStub);
 };
 
 }  // anonymous namespace
 
 CommandBufferDriver::Client::~Client() {
 }
 
-CommandBufferDriver::CommandBufferDriver(
-    gfx::GLShareGroup* share_group,
-    gpu::gles2::MailboxManager* mailbox_manager,
-    gpu::SyncPointManager* sync_point_manager)
+CommandBufferDriver::CommandBufferDriver(scoped_refptr<GpuState> gpu_state)
     : CommandBufferDriver(gfx::kNullAcceleratedWidget,
-                          share_group,
-                          mailbox_manager,
-                          sync_point_manager,
-                          base::Callback<void(CommandBufferDriver*)>()) {
-}
+                          gpu_state,
+                          base::Callback<void(CommandBufferDriver*)>()) {}
 
 CommandBufferDriver::CommandBufferDriver(
     gfx::AcceleratedWidget widget,
-    gfx::GLShareGroup* share_group,
-    gpu::gles2::MailboxManager* mailbox_manager,
-    gpu::SyncPointManager* sync_point_manager,
+    scoped_refptr<GpuState> gpu_state,
     const base::Callback<void(CommandBufferDriver*)>& destruct_callback)
     : client_(nullptr),
       widget_(widget),
-      share_group_(share_group),
-      mailbox_manager_(mailbox_manager),
-      sync_point_manager_(sync_point_manager),
+      gpu_state_(gpu_state),
       destruct_callback_(destruct_callback),
       weak_factory_(this) {
 }
 
 CommandBufferDriver::~CommandBufferDriver() {
   DestroyDecoder();
   if (!destruct_callback_.is_null())
     destruct_callback_.Run(this);
 }
 
@@ skipping 35 matching lines @@
       vsync_provider->GetVSyncParameters(
           base::Bind(&CommandBufferDriver::OnUpdateVSyncParameters,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
   if (!surface_.get())
     return false;
 
   // TODO(piman): virtual contexts, gpu preference.
-  context_ = gfx::GLContext::CreateGLContext(share_group_.get(), surface_.get(),
-                                             gfx::PreferIntegratedGpu);
+  context_ = gfx::GLContext::CreateGLContext(
+      gpu_state_->share_group(), surface_.get(), gfx::PreferIntegratedGpu);
   if (!context_.get())
     return false;
 
   if (!context_->MakeCurrent(surface_.get()))
     return false;
 
   // TODO(piman): ShaderTranslatorCache is currently per-ContextGroup but
   // only needs to be per-thread.
   bool bind_generates_resource = false;
   scoped_refptr<gpu::gles2::ContextGroup> context_group =
       new gpu::gles2::ContextGroup(
-          mailbox_manager_.get(), new MemoryTrackerStub,
+          gpu_state_->mailbox_manager(), new MemoryTrackerStub,
           new gpu::gles2::ShaderTranslatorCache, nullptr, nullptr, nullptr,
           bind_generates_resource);
 
   command_buffer_.reset(
       new gpu::CommandBufferService(context_group->transfer_buffer_manager()));
   bool result = command_buffer_->Initialize();
   DCHECK(result);
 
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group.get()));
   scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(), decoder_.get(),
@@ skipping 171 matching lines @@
   OnContextLost(state.context_lost_reason);
 }
 
 void CommandBufferDriver::OnResize(gfx::Size size, float scale_factor) {
   surface_->Resize(size);
 }
 
 bool CommandBufferDriver::OnWaitSyncPoint(uint32_t sync_point) {
   if (!sync_point)
     return true;
-  if (sync_point_manager_->IsSyncPointRetired(sync_point))
+  if (gpu_state_->sync_point_manager()->IsSyncPointRetired(sync_point))
     return true;
   scheduler_->SetScheduled(false);
-  sync_point_manager_->AddSyncPointCallback(
+  gpu_state_->sync_point_manager()->AddSyncPointCallback(
       sync_point, base::Bind(&CommandBufferDriver::OnSyncPointRetired,
                              weak_factory_.GetWeakPtr()));
   return scheduler_->IsScheduled();
 }
 
 void CommandBufferDriver::OnSyncPointRetired() {
   scheduler_->SetScheduled(true);
 }
 
 void CommandBufferDriver::OnContextLost(uint32_t reason) {
   loss_observer_->DidLoseContext(reason);
   client_->DidLoseContext();
 }
 
 void CommandBufferDriver::OnUpdateVSyncParameters(
     const base::TimeTicks timebase,
     const base::TimeDelta interval) {
   client_->UpdateVSyncParameters(timebase, interval);
 }
 
 void CommandBufferDriver::DestroyDecoder() {
   if (decoder_) {
     bool have_context = decoder_->MakeCurrent();
     decoder_->Destroy(have_context);
     decoder_.reset();
   }
 }
 
 }  // namespace gles2