| Index: ui/gl/gl_image_glx.h
|
| diff --git a/ui/gl/gl_image_glx.h b/ui/gl/gl_image_glx.h
|
| index e22512e9cb3e5657a4f9a4be553e4cc8d042a801..5de1d0d165f35ae0c8373217d0f29e9eb1a852df 100644
|
| --- a/ui/gl/gl_image_glx.h
|
| +++ b/ui/gl/gl_image_glx.h
|
| @@ -14,21 +14,24 @@
|
|
|
| class GL_EXPORT GLImageGLX : public GLImage {
|
| public:
|
| - GLImageGLX(const Size& size, unsigned internalformat);
|
| + GLImageGLX(const gfx::Size& size, unsigned internalformat);
|
|
|
| bool Initialize(XID pixmap);
|
|
|
| // Overridden from GLImage:
|
| void Destroy(bool have_context) override;
|
| - Size GetSize() override;
|
| + gfx::Size GetSize() override;
|
| unsigned GetInternalFormat() override;
|
| bool BindTexImage(unsigned target) override;
|
| void ReleaseTexImage(unsigned target) override;
|
| - bool CopyTexImage(unsigned target) override;
|
| bool CopyTexSubImage(unsigned target,
|
| const Point& offset,
|
| const Rect& rect) override;
|
| - bool ScheduleOverlayPlane(AcceleratedWidget widget,
|
| + void WillUseTexImage() override {}
|
| + void DidUseTexImage() override {}
|
| + void WillModifyTexImage() override {}
|
| + void DidModifyTexImage() override {}
|
| + bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
|
| int z_order,
|
| OverlayTransform transform,
|
| const Rect& bounds_rect,
|
| @@ -42,7 +45,7 @@
|
|
|
| private:
|
| XID glx_pixmap_;
|
| - const Size size_;
|
| + const gfx::Size size_;
|
| unsigned internalformat_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
|
|
|