Share SyncPointManager between ipc and in-process

components/view_manager/gles2/command_buffer_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 "components/view_manager/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "components/view_manager/gles2/command_buffer_driver.h"
 #include "components/view_manager/gles2/command_buffer_impl_observer.h"
+#include "components/view_manager/gles2/gpu_state.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 
 namespace gles2 {
 namespace {
 void RunCallback(const mojo::Callback<void()>& callback) {
   callback.Run();
 }
 }  // namespace
 
 class CommandBufferImpl::CommandBufferDriverClientImpl
@@ skipping 11 matching lines @@
   void DidLoseContext() override { command_buffer_->DidLoseContext(); }
 
   CommandBufferImpl* command_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferDriverClientImpl);
 };
 
 CommandBufferImpl::CommandBufferImpl(
     mojo::InterfaceRequest<mojo::CommandBuffer> request,
     mojo::ViewportParameterListenerPtr listener,
-    scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
-    gpu::SyncPointManager* sync_point_manager,
+    scoped_refptr<GpuState> gpu_state,
     scoped_ptr<CommandBufferDriver> driver)
-    : sync_point_manager_(sync_point_manager),
+    : gpu_state_(gpu_state),
       driver_task_runner_(base::MessageLoop::current()->task_runner()),
       driver_(driver.Pass()),
       viewport_parameter_listener_(listener.Pass()),
       binding_(this),
       observer_(nullptr) {
   driver_->set_client(make_scoped_ptr(new CommandBufferDriverClientImpl(this)));
 
-  control_task_runner->PostTask(
+  gpu_state_->control_task_runner()->PostTask(
       FROM_HERE, base::Bind(&CommandBufferImpl::BindToRequest,
                             base::Unretained(this), base::Passed(&request)));
 }
 
 void CommandBufferImpl::Initialize(
     mojo::CommandBufferSyncClientPtr sync_client,
     mojo::CommandBufferSyncPointClientPtr sync_point_client,
     mojo::CommandBufferLostContextObserverPtr loss_observer,
     mojo::ScopedSharedBufferHandle shared_state) {
   sync_point_client_ = sync_point_client.Pass();
@@ skipping 33 matching lines @@
                             base::Passed(&transfer_buffer), size));
 }
 
 void CommandBufferImpl::DestroyTransferBuffer(int32_t id) {
   driver_task_runner_->PostTask(
       FROM_HERE, base::Bind(&CommandBufferDriver::DestroyTransferBuffer,
                             base::Unretained(driver_.get()), id));
 }
 
 void CommandBufferImpl::InsertSyncPoint(bool retire) {
-  uint32_t sync_point = sync_point_manager_->GenerateSyncPoint();
+  uint32_t sync_point = gpu_state_->sync_point_manager()->GenerateSyncPoint();
   sync_point_client_->DidInsertSyncPoint(sync_point);
   if (retire) {
     driver_task_runner_->PostTask(
-        FROM_HERE, base::Bind(&gpu::SyncPointManager::RetireSyncPoint,
-                              sync_point_manager_, sync_point));
+        FROM_HERE,
+        base::Bind(&gpu::SyncPointManager::RetireSyncPoint,
+                   base::Unretained(gpu_state_->sync_point_manager()),
+                   sync_point));
   }
 }
 
 void CommandBufferImpl::RetireSyncPoint(uint32_t sync_point) {
   driver_task_runner_->PostTask(
       FROM_HERE, base::Bind(&gpu::SyncPointManager::RetireSyncPoint,
-                            sync_point_manager_, sync_point));
+                            base::Unretained(gpu_state_->sync_point_manager()),
+                            sync_point));
 }
 
 void CommandBufferImpl::Echo(const mojo::Callback<void()>& callback) {
   driver_task_runner_->PostTaskAndReply(FROM_HERE, base::Bind(&base::DoNothing),
                                         base::Bind(&RunCallback, callback));
 }
 
 void CommandBufferImpl::CreateImage(int32_t id,
                                     mojo::ScopedHandle memory_handle,
                                     int32 type,
@@ skipping 42 matching lines @@
 
 void CommandBufferImpl::UpdateVSyncParameters(base::TimeTicks timebase,
                                               base::TimeDelta interval) {
   if (!viewport_parameter_listener_)
     return;
   viewport_parameter_listener_->OnVSyncParametersUpdated(
       timebase.ToInternalValue(), interval.ToInternalValue());
 }
 
 }  // namespace gles2