| Index: ui/gl/gl_image_memory.h
|
| diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h
|
| index 2d6b93e245d83998dd3577bd66f197bb6b78605d..fd659e76e58b221b91dcddff360ae6fe8a377723 100644
|
| --- a/ui/gl/gl_image_memory.h
|
| +++ b/ui/gl/gl_image_memory.h
|
| @@ -27,23 +27,23 @@ class GL_EXPORT GLImageMemory : public GLImage {
|
| gfx::GpuMemoryBuffer::Format format);
|
|
|
| // 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 ~GLImageMemory();
|
| + ~GLImageMemory() override;
|
|
|
| private:
|
| void DoBindTexImage(unsigned target);
|
|
|