Index: ui/gl/gl_image.h |
diff --git a/ui/gl/gl_image.h b/ui/gl/gl_image.h |
index aba2651ee9d476b940ddd68ec92ea350cd5b5329..a23669952a80b8de92eb1a508f9a3124ff2901e1 100644 |
--- a/ui/gl/gl_image.h |
+++ b/ui/gl/gl_image.h |
@@ -4,8 +4,6 @@ |
#ifndef UI_GL_GL_IMAGE_H_ |
#define UI_GL_GL_IMAGE_H_ |
- |
-#include <string> |
#include "base/memory/ref_counted.h" |
#include "ui/gfx/geometry/point.h" |
@@ -24,8 +22,8 @@ |
namespace gfx { |
-// Encapsulates an image that can be bound and/or copied to a texture, hiding |
-// platform specific management. |
+// Encapsulates an image that can be bound to a texture, hiding platform |
+// specific management. |
class GL_EXPORT GLImage : public base::RefCounted<GLImage> { |
public: |
GLImage() {} |
@@ -34,32 +32,36 @@ |
virtual void Destroy(bool have_context) = 0; |
// Get the size of the image. |
- virtual Size GetSize() = 0; |
+ virtual gfx::Size GetSize() = 0; |
// Get the internal format of the image. |
virtual unsigned GetInternalFormat() = 0; |
- // Bind image to texture currently bound to |target|. Returns true on success. |
- // It is valid for an implementation to always return false. |
+ // Bind image to texture currently bound to |target|. |
virtual bool BindTexImage(unsigned target) = 0; |
// Release image from texture currently bound to |target|. |
virtual void ReleaseTexImage(unsigned target) = 0; |
- // Define texture currently bound to |target| by copying image into it. |
- // Returns true on success. It is valid for an implementation to always |
- // return false. |
- virtual bool CopyTexImage(unsigned target) = 0; |
- |
// Copy |rect| of image to |offset| in texture currently bound to |target|. |
- // Returns true on success. It is valid for an implementation to always |
- // return false. |
virtual bool CopyTexSubImage(unsigned target, |
const Point& offset, |
const Rect& rect) = 0; |
+ // Called before the texture is used for drawing. |
+ virtual void WillUseTexImage() = 0; |
+ |
+ // Called after the texture has been used for drawing. |
+ virtual void DidUseTexImage() = 0; |
+ |
+ // Called before the texture image data will be modified. |
+ virtual void WillModifyTexImage() = 0; |
+ |
+ // Called after the texture image data has been modified. |
+ virtual void DidModifyTexImage() = 0; |
+ |
// Schedule image as an overlay plane to be shown at swap time for |widget|. |
- virtual bool ScheduleOverlayPlane(AcceleratedWidget widget, |
+ virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, |
int z_order, |
OverlayTransform transform, |
const Rect& bounds_rect, |