| Index: ui/gl/gl_image.h
|
| diff --git a/ui/gl/gl_image.h b/ui/gl/gl_image.h
|
| index f1d05371f6beeae8de923774023a8e8978b05dac..660721edc99d1d36ceee3161a0b793fc9f6062ef 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);
|
|
|
| + // Updates the texture. Only used for multi-buffered/streaming textures.
|
| + virtual void UpdateTexImage();
|
| +
|
| // 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);
|
| +
|
| +#if defined(OS_ANDROID)
|
| + virtual GLImageStream* AsGLImageStream() { return NULL; }
|
| +#endif
|
| +
|
| protected:
|
| virtual ~GLImage();
|
|
|
|
|