| Index: ui/gl/gl_image_glx.h
|
| diff --git a/ui/gl/gl_image_glx.h b/ui/gl/gl_image_glx.h
|
| index 57c55c56465218e80517ca583717714ac427976e..f6031e23a05915ff671235a2a9dff5a474a611f7 100644
|
| --- a/ui/gl/gl_image_glx.h
|
| +++ b/ui/gl/gl_image_glx.h
|
| @@ -19,23 +19,23 @@ class GL_EXPORT GLImageGLX : public GLImage {
|
| bool Initialize(XID pixmap);
|
|
|
| // Overridden from GLImage:
|
| - virtual void Destroy(bool have_context) override;
|
| - virtual gfx::Size GetSize() override;
|
| - virtual bool BindTexImage(unsigned target) override;
|
| - virtual void ReleaseTexImage(unsigned target) override;
|
| - virtual bool CopyTexImage(unsigned target) override;
|
| - virtual void WillUseTexImage() override {}
|
| - 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;
|
| + void Destroy(bool have_context) override;
|
| + gfx::Size GetSize() override;
|
| + bool BindTexImage(unsigned target) override;
|
| + void ReleaseTexImage(unsigned target) override;
|
| + bool CopyTexImage(unsigned target) override;
|
| + 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,
|
| + const RectF& crop_rect) override;
|
|
|
| protected:
|
| - virtual ~GLImageGLX();
|
| + ~GLImageGLX() override;
|
|
|
| private:
|
| XID glx_pixmap_;
|
|
|