Remove StreamTextureManager

ui/gl/gl_image.h

 // Copyright (c) 2012 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 UI_GL_GL_IMAGE_H_
 #define UI_GL_GL_IMAGE_H_
 
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_export.h"
 
 namespace gfx {
 
 class GLSurface;
 
+#if defined(OS_ANDROID)
+class GLImageStream;
+#endif
+
 // Encapsulates an image that can be bound to a texture, hiding platform
 // specific management.
 class GL_EXPORT GLImage : public base::RefCounted<GLImage> {
  public:
   GLImage();
 
   // Destroys the image.
   virtual void Destroy() = 0;
 
   // Get the size of the image.
   virtual gfx::Size GetSize() = 0;
 
   // Bind image to texture currently bound to GL_TEXTURE_2D target.
   virtual bool BindTexImage();
 
   // Release image from texture currently bound to GL_TEXTURE_2D target.
   virtual void ReleaseTexImage();
 
   // Create a GL image for a window.
   static scoped_refptr<GLImage> CreateGLImage(gfx::PluginWindowHandle window);
 
+  // Called before the texture is used for drawing.
+  virtual void WillUseTexImage();

[reveman, 2013/08/14 15:22:44]

please move this above all static methods.

[no sievers, 2013/08/14 18:16:48]

Done.

+
   // Create a GL image for a GPU Memory buffer.
   static scoped_refptr<GLImage> CreateGLImageForGpuMemoryBuffer(
       gfx::GpuMemoryBufferHandle buffer, gfx::Size size);
 
+  // Create a GL image for a streaming texture.
+  static scoped_refptr<GLImage> CreateGLImageForStreamTexture(
+      unsigned int texture_id);

[reveman, 2013/08/14 15:22:44]

I prefer if you didn't add this until the usage matches existing GLImage usage.

[no sievers, 2013/08/14 18:16:48]

Done.

+
+#if defined(OS_ANDROID)
+  virtual GLImageStream* AsGLImageStream();
+#endif
+
  protected:
   virtual ~GLImage();
 
  private:
   friend class base::RefCounted<GLImage>;
 
   DISALLOW_COPY_AND_ASSIGN(GLImage);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_IMAGE_H_