| Index: ui/gl/gl_image_memory.h
|
| diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h
|
| index 6dbec46bfe55ca894757ee296b756662021b0962..067e4fbd2834d19e500dea9fe900c85d6cd4f87e 100644
|
| --- a/ui/gl/gl_image_memory.h
|
| +++ b/ui/gl/gl_image_memory.h
|
| @@ -22,20 +22,20 @@ class GL_EXPORT GLImageMemory : public GLImage {
|
| bool Initialize(const unsigned char* memory);
|
|
|
| // 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 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;
|
| + const RectF& crop_rect) override;
|
|
|
| protected:
|
| virtual ~GLImageMemory();
|
|
|