Index: ui/gl/gl_image.h |
diff --git a/ui/gl/gl_image.h b/ui/gl/gl_image.h |
index f1d05371f6beeae8de923774023a8e8978b05dac..58096566c9e7c45dca9aee9db54092517635306b 100644 |
--- a/ui/gl/gl_image.h |
+++ b/ui/gl/gl_image.h |
@@ -15,6 +15,10 @@ 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> { |
@@ -36,10 +40,21 @@ class GL_EXPORT GLImage : public base::RefCounted<GLImage> { |
// 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 ma
no sievers
2013/08/14 18:16:48
Done.
|
+ |
+#if defined(OS_ANDROID) |
+ virtual GLImageStream* AsGLImageStream(); |
+#endif |
+ |
protected: |
virtual ~GLImage(); |