gpu: Separate GpuControlService from GpuControl

gpu/command_buffer/service/gpu_control_service.h

Index: gpu/command_buffer/service/gpu_control_service.h
diff --git a/gpu/command_buffer/service/gpu_control_service.h b/gpu/command_buffer/service/gpu_control_service.h
index 74fd4d5a16a4081e349d264f8a6903251de22938..f9c58542bbb147dbc6deda6acb2c18889c6efbab 100644
--- a/gpu/command_buffer/service/gpu_control_service.h
+++ b/gpu/command_buffer/service/gpu_control_service.h
@@ -5,10 +5,9 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_CONTROL_SERVICE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_CONTROL_SERVICE_H_
 
-#include <map>
-
-#include "base/memory/linked_ptr.h"
-#include "gpu/command_buffer/common/gpu_control.h"
+#include "base/callback.h"
+#include "gpu/command_buffer/common/capabilities.h"
+#include "gpu/gpu_export.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace gpu {
@@ -20,51 +19,26 @@ class MailboxManager;
 class QueryManager;
 }
 
-class GPU_EXPORT GpuControlService : public GpuControl {
+class GPU_EXPORT GpuControlService {

[piman, 2014/05/01 19:28:05]

nit: not sure this should still be called GpuControlService.

Should it be merged with CommandBufferService?

[boliu, 2014/05/01 22:10:46]

Looked this a bit. But didn't do anything.

A straight forward merging introduces circular dependency. Right now dependency
goes GpuControlService -> decoder -> scheduler -> command buffer. So control and
command buffer are merged, then it needs setters for memory buffer and query
managers, which makes init and tear down brittle.

Maybe it makes sense for decoder to set the two managers directly, but it looks
like a unnecessary layering violation.

Thoughts?

  public:
   GpuControlService(GpuMemoryBufferManagerInterface* gpu_memory_buffer_manager,
-                    GpuMemoryBufferFactory* gpu_memory_buffer_factory,
                     gles2::MailboxManager* mailbox_manager,

[piman, 2014/05/01 19:28:05]

You're not using the MailboxManager. remove?

[boliu, 2014/05/01 22:10:46]

Done.

-                    gles2::QueryManager* query_manager,
-                    const gpu::Capabilities& decoder_capabilities);
+                    gles2::QueryManager* query_manager);
   virtual ~GpuControlService();
 
+  void SignalQuery(uint32 query, const base::Closure& callback);
 
-  // GpuControl implementation.
-  virtual gpu::Capabilities GetCapabilities() OVERRIDE;
-  virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(
-      size_t width,
-      size_t height,
-      unsigned internalformat,
-      int32* id) OVERRIDE;
-  virtual void DestroyGpuMemoryBuffer(int32 id) OVERRIDE;
-  virtual uint32 InsertSyncPoint() OVERRIDE;
-  virtual void SignalSyncPoint(uint32 sync_point,
-                               const base::Closure& callback) OVERRIDE;
-  virtual void SignalQuery(uint32 query,
-                           const base::Closure& callback) OVERRIDE;
-  virtual void SetSurfaceVisible(bool visible) OVERRIDE;
-  virtual void SendManagedMemoryStats(const ManagedMemoryStats& stats)
-      OVERRIDE;
-  virtual void Echo(const base::Closure& callback) OVERRIDE;
-  virtual uint32 CreateStreamTexture(uint32 texture_id) OVERRIDE;
-
-  // Register an existing gpu memory buffer and get an ID that can be used
-  // to identify it in the command buffer.
-  bool RegisterGpuMemoryBuffer(int32 id,
+  void RegisterGpuMemoryBuffer(int32 id,
                                gfx::GpuMemoryBufferHandle buffer,
                                size_t width,
                                size_t height,
                                unsigned internalformat);
+  void UnregisterGpuMemoryBuffer(int32 id);
 
  private:
   GpuMemoryBufferManagerInterface* gpu_memory_buffer_manager_;
-  GpuMemoryBufferFactory* gpu_memory_buffer_factory_;
   gles2::MailboxManager* mailbox_manager_;
   gles2::QueryManager* query_manager_;
-  typedef std::map<int32, linked_ptr<gfx::GpuMemoryBuffer> > GpuMemoryBufferMap;
-  GpuMemoryBufferMap gpu_memory_buffers_;
-  gpu::Capabilities capabilities_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuControlService);
 };