gpu: Refactor GpuMemoryBuffer framework for multi-process support.

gpu/command_buffer/client/gpu_memory_buffer_tracker.h

Index: gpu/command_buffer/client/gpu_memory_buffer_tracker.h
diff --git a/gpu/command_buffer/client/gpu_memory_buffer_tracker.h b/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
index f2f6e9f057e3301d8e9d8b0561786340904f7d08..52052ac16ce2ced2053320ecab765091084343a8 100644
--- a/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
+++ b/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
@@ -5,34 +5,33 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_TRACKER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_TRACKER_H_
 
-#include <GLES2/gl2.h>
-
 #include "base/basictypes.h"
 #include "gles2_impl_export.h"
 #include "gpu/command_buffer/client/hash_tables.h"
 
-namespace gpu {
+namespace gfx {
 class GpuMemoryBuffer;
+}
+
+namespace gpu {
+class CommandBufferHelper;
 
 namespace gles2 {
-class ImageFactory;
 
 // Tracks GPU memory buffer objects on the client side.
 class GLES2_IMPL_EXPORT GpuMemoryBufferTracker {
  public:
-  // Ownership of |factory| remains with caller.
-  explicit GpuMemoryBufferTracker(ImageFactory* factory);
+  explicit GpuMemoryBufferTracker(CommandBufferHelper* helper);
   virtual ~GpuMemoryBufferTracker();
 
-  GLuint CreateBuffer(
-      GLsizei width, GLsizei height, GLenum internalformat);
-  GpuMemoryBuffer* GetBuffer(GLuint image_id);
-  void RemoveBuffer(GLuint image_id);
+  int32 CreateBuffer(size_t width, size_t height, int32 internalformat);
+  gfx::GpuMemoryBuffer* GetBuffer(int32 image_id);
+  void RemoveBuffer(int32 image_id);
 
  private:
-  typedef gpu::hash_map<GLuint, GpuMemoryBuffer*> BufferMap;
+  typedef gpu::hash_map<int32, gfx::GpuMemoryBuffer*> BufferMap;
   BufferMap buffers_;
-  ImageFactory* factory_;
+  CommandBufferHelper* helper_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferTracker);
 };