GPU client side changes for GpuMemoryBuffers

gpu/command_buffer/service/image_manager.h

Index: gpu/command_buffer/service/image_manager.h
diff --git a/gpu/command_buffer/service/image_manager.h b/gpu/command_buffer/service/image_manager.h
index 06a02bc57d6dacf77bed07d962ba93fc443babf9..727e2a4d757f662bab9a7b82d5378e787e89afee 100644
--- a/gpu/command_buffer/service/image_manager.h
+++ b/gpu/command_buffer/service/image_manager.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
+#include "gpu/command_buffer/common/image_buffer_manager.h"
 #include "gpu/gpu_export.h"
 
 namespace gfx {
@@ -18,7 +19,8 @@ namespace gpu {
 namespace gles2 {
 
 // Interface used by the cmd decoder to lookup images.
-class GPU_EXPORT ImageManager : public base::RefCounted<ImageManager> {
+class GPU_EXPORT ImageManager : public base::RefCounted<ImageManager>,
+                                public ImageManagerProxy {
  public:
   ImageManager();
 
@@ -26,6 +28,9 @@ class GPU_EXPORT ImageManager : public base::RefCounted<ImageManager> {
   void RemoveImage(int32 service_id);
   gfx::GLImage* LookupImage(int32 service_id);
 
+  // Methods from ImageManagerProxy
+  void AddImageBuffer(void* buffer, int image_id, int width,
+                      int height) OVERRIDE;
  private:
   friend class base::RefCounted<ImageManager>;