Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / gl / gl_image_io_surface.h

diff --git a/src/ui/gl/gl_image_io_surface.h b/src/ui/gl/gl_image_io_surface.h
index 7825e7d..f360e78 100644 (file)
--- a/src/ui/gl/gl_image_io_surface.h
+++ b/src/ui/gl/gl_image_io_surface.h
@@ -8,18 +8,19 @@
 #include <IOSurface/IOSurfaceAPI.h>
 
 #include "base/mac/scoped_cftyperef.h"
+#include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gl/gl_image.h"
 
 namespace gfx {
 
 class GL_EXPORT GLImageIOSurface : public GLImage {
  public:
-  explicit GLImageIOSurface(gfx::Size size);
+  explicit GLImageIOSurface(const gfx::Size& size);
 
-  bool Initialize(gfx::GpuMemoryBufferHandle buffer);
+  bool Initialize(const gfx::GpuMemoryBufferHandle& handle);
 
   // Overridden from GLImage:
-  virtual void Destroy() OVERRIDE {}
+  virtual void Destroy(bool have_context) OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool BindTexImage(unsigned target) OVERRIDE;
   virtual void ReleaseTexImage(unsigned target) OVERRIDE {}
@@ -27,13 +28,18 @@ class GL_EXPORT GLImageIOSurface : public GLImage {
   virtual void DidUseTexImage() OVERRIDE {}
   virtual void WillModifyTexImage() OVERRIDE {}
   virtual void DidModifyTexImage() OVERRIDE {}
+  virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
+                                    int z_order,
+                                    OverlayTransform transform,
+                                    const Rect& bounds_rect,
+                                    const RectF& crop_rect) OVERRIDE;
 
  protected:
   virtual ~GLImageIOSurface();
 
  private:
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
-  gfx::Size size_;
+  const gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface);
 };