| Index: ui/gl/gl_surface.h
|
| diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h
|
| index 3851c1c7c81b935154533af5f39a53c1f1791bf6..7c7a5cec712e971e629e2ae7b78bd6205e209635 100644
|
| --- a/ui/gl/gl_surface.h
|
| +++ b/ui/gl/gl_surface.h
|
| @@ -158,32 +158,32 @@ class GL_EXPORT GLSurfaceAdapter : public GLSurface {
|
| public:
|
| explicit GLSurfaceAdapter(GLSurface* surface);
|
|
|
| - virtual bool Initialize() OVERRIDE;
|
| - virtual void Destroy() OVERRIDE;
|
| - virtual bool Resize(const gfx::Size& size) OVERRIDE;
|
| - virtual bool Recreate() OVERRIDE;
|
| - virtual bool DeferDraws() OVERRIDE;
|
| - virtual bool IsOffscreen() OVERRIDE;
|
| - virtual bool SwapBuffers() OVERRIDE;
|
| - virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
|
| - virtual bool SupportsPostSubBuffer() OVERRIDE;
|
| - virtual gfx::Size GetSize() OVERRIDE;
|
| - virtual void* GetHandle() OVERRIDE;
|
| - virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
|
| - virtual bool OnMakeCurrent(GLContext* context) OVERRIDE;
|
| - virtual bool SetBackbufferAllocation(bool allocated) OVERRIDE;
|
| - virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
|
| - virtual void* GetShareHandle() OVERRIDE;
|
| - virtual void* GetDisplay() OVERRIDE;
|
| - virtual void* GetConfig() OVERRIDE;
|
| - virtual unsigned GetFormat() OVERRIDE;
|
| - virtual VSyncProvider* GetVSyncProvider() OVERRIDE;
|
| + virtual bool Initialize() override;
|
| + virtual void Destroy() override;
|
| + virtual bool Resize(const gfx::Size& size) override;
|
| + virtual bool Recreate() override;
|
| + virtual bool DeferDraws() override;
|
| + virtual bool IsOffscreen() override;
|
| + virtual bool SwapBuffers() override;
|
| + virtual bool PostSubBuffer(int x, int y, int width, int height) override;
|
| + virtual bool SupportsPostSubBuffer() override;
|
| + virtual gfx::Size GetSize() override;
|
| + virtual void* GetHandle() override;
|
| + virtual unsigned int GetBackingFrameBufferObject() override;
|
| + virtual bool OnMakeCurrent(GLContext* context) override;
|
| + virtual bool SetBackbufferAllocation(bool allocated) override;
|
| + virtual void SetFrontbufferAllocation(bool allocated) override;
|
| + virtual void* GetShareHandle() override;
|
| + virtual void* GetDisplay() override;
|
| + virtual void* GetConfig() override;
|
| + virtual unsigned GetFormat() override;
|
| + virtual VSyncProvider* GetVSyncProvider() override;
|
| virtual bool ScheduleOverlayPlane(int z_order,
|
| OverlayTransform transform,
|
| GLImage* image,
|
| const Rect& bounds_rect,
|
| - const RectF& crop_rect) OVERRIDE;
|
| - virtual bool IsSurfaceless() const OVERRIDE;
|
| + const RectF& crop_rect) override;
|
| + virtual bool IsSurfaceless() const override;
|
|
|
| GLSurface* surface() const { return surface_.get(); }
|
|
|
|
|