gpu: Compositor management of GpuMemoryBuffer instances.

cc/test/test_web_graphics_context_3d.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 234 matching lines @@
   virtual void bufferData(GLenum target,
                           GLsizeiptr size,
                           const void* data,
                           GLenum usage);
   virtual void* mapBufferCHROMIUM(GLenum target,
                                   GLenum access);
   virtual GLboolean unmapBufferCHROMIUM(GLenum target);
 
   virtual GLuint createImageCHROMIUM(GLsizei width,
                                      GLsizei height,
-                                     GLenum internalformat,
-                                     GLenum usage);
+                                     GLenum internalformat);
   virtual void destroyImageCHROMIUM(GLuint image_id);
-  virtual void getImageParameterivCHROMIUM(GLuint image_id,
-                                           GLenum pname,
-                                           GLint* params);
-  virtual void* mapImageCHROMIUM(GLuint image_id);
-  virtual void unmapImageCHROMIUM(GLuint image_id);
-  virtual GLuint createGpuMemoryBufferImageCHROMIUM(GLsizei width,
-                                                    GLsizei height,
-                                                    GLenum internalformat,
-                                                    GLenum usage);
+
   virtual void texImageIOSurface2DCHROMIUM(GLenum target,
                                            GLsizei width,
                                            GLsizei height,
                                            GLuint io_surface_id,
                                            GLuint plane) {}
 
   virtual unsigned insertSyncPoint();
   virtual void waitSyncPoint(unsigned sync_point);
 
   unsigned last_waited_sync_point() const { return last_waited_sync_point_; }
 
   const ContextProvider::Capabilities& test_capabilities() const {
     return test_capabilities_;
   }
 
   void set_context_lost(bool context_lost) { context_lost_ = context_lost; }
   void set_times_bind_texture_succeeds(int times) {
     times_bind_texture_succeeds_ = times;
   }
   void set_times_end_query_succeeds(int times) {
     times_end_query_succeeds_ = times;
   }
 
-  // When set, mapImageCHROMIUM and mapBufferCHROMIUM will return NULL after
-  // this many times.
-  void set_times_map_image_chromium_succeeds(int times) {
-    times_map_image_chromium_succeeds_ = times;
-  }
+  // When set, mapBufferCHROMIUM will return NULL after this many times.
   void set_times_map_buffer_chromium_succeeds(int times) {
     times_map_buffer_chromium_succeeds_ = times;
   }
 
   size_t NumTextures() const;
   GLuint TextureAt(int i) const;
 
   size_t NumUsedTextures() const { return used_textures_.size(); }
   bool UsedTexture(int texture) const {
     return ContainsKey(used_textures_, texture);
@@ skipping 110 matching lines @@
 
   struct Namespace : public base::RefCountedThreadSafe<Namespace> {
     Namespace();
 
     // Protects all fields.
     base::Lock lock;
     unsigned next_buffer_id;
     unsigned next_image_id;
     unsigned next_texture_id;
     base::ScopedPtrHashMap<unsigned, Buffer> buffers;
-    base::ScopedPtrHashMap<unsigned, Image> images;
+    base::hash_set<unsigned> images;
     OrderedTextureMap textures;
 
    private:
     friend class base::RefCountedThreadSafe<Namespace>;
     ~Namespace();
     DISALLOW_COPY_AND_ASSIGN(Namespace);
   };
 
   TestWebGraphicsContext3D();
 
   void CreateNamespace();
   GLuint BoundTextureId(GLenum target);
   scoped_refptr<TestTexture> BoundTexture(GLenum target);
   void CheckTextureIsBound(GLenum target);
 
   unsigned context_id_;
   ContextProvider::Capabilities test_capabilities_;
   int times_bind_texture_succeeds_;
   int times_end_query_succeeds_;
   bool context_lost_;
-  int times_map_image_chromium_succeeds_;
   int times_map_buffer_chromium_succeeds_;
   int current_used_transfer_buffer_usage_bytes_;
   int max_used_transfer_buffer_usage_bytes_;
   base::Closure context_lost_callback_;
   base::hash_set<unsigned> used_textures_;
   unsigned next_program_id_;
   base::hash_set<unsigned> program_set_;
   unsigned next_shader_id_;
   base::hash_set<unsigned> shader_set_;
   std::vector<TestWebGraphicsContext3D*> shared_contexts_;
@@ skipping 13 matching lines @@
 
   scoped_refptr<Namespace> namespace_;
   static Namespace* shared_namespace_;
 
   base::WeakPtrFactory<TestWebGraphicsContext3D> weak_ptr_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_