Share SyncPointManager between ipc and in-process

components/view_manager/gles2/command_buffer_impl.h

 // 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.
 
 #ifndef COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_IMPL_H_
 #define COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "components/view_manager/public/interfaces/command_buffer.mojom.h"
 #include "components/view_manager/public/interfaces/viewport_parameter_listener.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
-namespace gpu {
-class SyncPointManager;
-}
-
 namespace gles2 {
 class CommandBufferDriver;
 class CommandBufferImplObserver;
+class GpuState;
 
 // This class listens to the CommandBuffer message pipe on a low-latency thread
 // so that we can insert sync points without blocking on the GL driver. It
 // forwards most method calls to the CommandBufferDriver, which runs on the
 // same thread as the native viewport.
 class CommandBufferImpl : public mojo::CommandBuffer {
  public:
-  CommandBufferImpl(
-      mojo::InterfaceRequest<CommandBuffer> request,
-      mojo::ViewportParameterListenerPtr listener,
-      scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
-      gpu::SyncPointManager* sync_point_manager,
-      scoped_ptr<CommandBufferDriver> driver);
+  CommandBufferImpl(mojo::InterfaceRequest<CommandBuffer> request,
+                    mojo::ViewportParameterListenerPtr listener,
+                    scoped_refptr<GpuState> gpu_state,
+                    scoped_ptr<CommandBufferDriver> driver);
 
   // mojo::CommandBuffer:
   void Initialize(mojo::CommandBufferSyncClientPtr sync_client,
                   mojo::CommandBufferSyncPointClientPtr sync_point_client,
                   mojo::CommandBufferLostContextObserverPtr loss_observer,
                   mojo::ScopedSharedBufferHandle shared_state) override;
   void SetGetBuffer(int32_t buffer) override;
   void Flush(int32_t put_offset) override;
   void MakeProgress(int32_t last_get_offset) override;
   void RegisterTransferBuffer(int32_t id,
@@ skipping 24 matching lines @@
 
   ~CommandBufferImpl() override;
 
   void BindToRequest(mojo::InterfaceRequest<CommandBuffer> request);
 
   void UpdateVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval);
 
   void OnConnectionError();
 
-  scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
+  scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<base::SingleThreadTaskRunner> driver_task_runner_;
   scoped_ptr<CommandBufferDriver> driver_;
   mojo::CommandBufferSyncPointClientPtr sync_point_client_;
   mojo::ViewportParameterListenerPtr viewport_parameter_listener_;
   mojo::Binding<CommandBuffer> binding_;
   CommandBufferImplObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferImpl);
 };
 
 }  // namespace gles2
 
 #endif  // COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_IMPL_H_