gpu: Refactor GpuMemoryBuffer framework for multi-process support.

gpu/command_buffer/service/command_buffer_service.h

Index: gpu/command_buffer/service/command_buffer_service.h
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index 232bdc0a56b66574419a7d5cea86ed1d844be50e..d50cc37d9b3780fe50f7a5c1a027c295868eb231 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -5,22 +5,31 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_
 
+#include <map>
+
 #include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/command_buffer_shared.h"
+#include "ui/gfx/gpu_memory_buffer.h"
 
 namespace gpu {
-
+class GpuMemoryBufferFactory;
 class TransferBufferManagerInterface;
 
+namespace gles2 {
+class ImageManager;
+}
+
 // An object that implements a shared memory command buffer and a synchronous
 // API to manage the put and get pointers.
 class GPU_EXPORT CommandBufferService : public CommandBuffer {
  public:
   typedef base::Callback<bool(int32)> GetBufferChangedCallback;
-  explicit CommandBufferService(
-      TransferBufferManagerInterface* transfer_buffer_manager);
+  CommandBufferService(
+      TransferBufferManagerInterface* transfer_buffer_manager,
+      gles2::ImageManager* image_manager,
+      GpuMemoryBufferFactory* gpu_memory_buffer_factory);
   virtual ~CommandBufferService();
 
   // CommandBuffer implementation:
@@ -39,6 +48,12 @@ class GPU_EXPORT CommandBufferService : public CommandBuffer {
   virtual void SetParseError(error::Error error) OVERRIDE;
   virtual void SetContextLostReason(error::ContextLostReason) OVERRIDE;
   virtual uint32 InsertSyncPoint() OVERRIDE;
+  virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(
+      size_t width,
+      size_t height,
+      unsigned internalformat,
+      int32* id) OVERRIDE;
+  virtual void DestroyGpuMemoryBuffer(int32 id) OVERRIDE;
 
   // Sets a callback that is called whenever the put offset is changed. When
   // called with sync==true, the callback must not return until some progress
@@ -67,6 +82,14 @@ class GPU_EXPORT CommandBufferService : public CommandBuffer {
                               base::SharedMemory* shared_memory,
                               size_t size);
 
+  // Register an existing gpu memory buffer and get an ID that can be used

[kaanb, 2013/07/24 03:31:23]

nit: s/Registers/Register/

[reveman, 2013/07/24 05:47:12]

It describes what the function is used for and not what it does. "Registers"
would required that second part of the sentence to be rewritten. I think it's
more important to be consistent with RegisterTransferBuffer above so I'll keep
this as is.

+  // to identify it in the command buffer.
+  bool RegisterGpuMemoryBuffer(int32 id,
+                               gfx::GpuMemoryBufferHandle buffer,
+                               size_t width,
+                               size_t height,
+                               unsigned internalformat);
+
  private:
   int32 ring_buffer_id_;
   Buffer ring_buffer_;
@@ -83,6 +106,10 @@ class GPU_EXPORT CommandBufferService : public CommandBuffer {
   uint32 generation_;
   error::Error error_;
   error::ContextLostReason context_lost_reason_;
+  GpuMemoryBufferFactory* gpu_memory_buffer_factory_;
+  gles2::ImageManager* image_manager_;
+  typedef std::map<int32, gfx::GpuMemoryBuffer*> GpuMemoryBufferMap;
+  GpuMemoryBufferMap gpu_memory_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferService);
 };