gpu: Compositor management of GpuMemoryBuffer instances.

gpu/command_buffer/client/gles2_implementation.h

Index: gpu/command_buffer/client/gles2_implementation.h
diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
index e3d8fd91796113f4021ac448fd651ba283b07b73..881ddaba19cf5e1458faf041051661eed26bd0e9 100644
--- a/gpu/command_buffer/client/gles2_implementation.h
+++ b/gpu/command_buffer/client/gles2_implementation.h
@@ -6,6 +6,7 @@
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <GLES2/gl2.h>
+#include <GLES2/gl2extchromium.h>
 
 #include <list>
 #include <map>
@@ -24,7 +25,6 @@
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_impl_export.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_tracker.h"
 #include "gpu/command_buffer/client/mapped_memory.h"
 #include "gpu/command_buffer/client/query_tracker.h"
 #include "gpu/command_buffer/client/ref_counted.h"
@@ -543,15 +543,11 @@ class GLES2_IMPL_EXPORT GLES2Implementation
       GLenum target, GLintptr offset, GLsizeiptr size, const void* data,
       ScopedTransferBufferPtr* buffer);
 
-  GLuint CreateImageCHROMIUMHelper(GLsizei width,
+  GLuint CreateImageCHROMIUMHelper(ClientBuffer buffer,
+                                   GLsizei width,
                                    GLsizei height,
-                                   GLenum internalformat,
-                                   GLenum usage);
+                                   GLenum internalformat);
   void DestroyImageCHROMIUMHelper(GLuint image_id);
-  void* MapImageCHROMIUMHelper(GLuint image_id);
-  void UnmapImageCHROMIUMHelper(GLuint image_id);
-  void GetImageParameterivCHROMIUMHelper(
-      GLuint image_id, GLenum pname, GLint* params);
   GLuint CreateGpuMemoryBufferImageCHROMIUMHelper(GLsizei width,
                                                   GLsizei height,
                                                   GLenum internalformat,
@@ -774,8 +770,6 @@ class GLES2_IMPL_EXPORT GLES2Implementation
 
   scoped_ptr<BufferTracker> buffer_tracker_;
 
-  scoped_ptr<GpuMemoryBufferTracker> gpu_memory_buffer_tracker_;
-
   GLES2ImplementationErrorMessageCallback* error_message_callback_;
 
   scoped_ptr<std::string> current_trace_name_;