| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index 87739da440becb2d511d413a0bb586c407795c59..72f51b5cd4ee750c020ecf872ae7f856facccfc2 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -57,13 +57,13 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
|
|
| virtual ~GLRenderer();
|
|
|
| - virtual const RendererCapabilitiesImpl& Capabilities() const OVERRIDE;
|
| + virtual const RendererCapabilitiesImpl& Capabilities() const override;
|
|
|
| // Waits for rendering to finish.
|
| - virtual void Finish() OVERRIDE;
|
| + virtual void Finish() override;
|
|
|
| - virtual void DoNoOp() OVERRIDE;
|
| - virtual void SwapBuffers(const CompositorFrameMetadata& metadata) OVERRIDE;
|
| + virtual void DoNoOp() override;
|
| + virtual void SwapBuffers(const CompositorFrameMetadata& metadata) override;
|
|
|
| virtual bool IsContextLost();
|
|
|
| @@ -80,7 +80,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| TextureMailboxDeleter* texture_mailbox_deleter,
|
| int highp_threshold_min);
|
|
|
| - virtual void DidChangeVisibility() OVERRIDE;
|
| + virtual void DidChangeVisibility() override;
|
|
|
| bool IsBackbufferDiscarded() const { return is_backbuffer_discarded_; }
|
|
|
| @@ -101,26 +101,26 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| void SetBlendEnabled(bool enabled);
|
| bool blend_enabled() const { return blend_shadow_; }
|
|
|
| - virtual void BindFramebufferToOutputSurface(DrawingFrame* frame) OVERRIDE;
|
| + virtual void BindFramebufferToOutputSurface(DrawingFrame* frame) override;
|
| virtual bool BindFramebufferToTexture(DrawingFrame* frame,
|
| const ScopedResource* resource,
|
| - const gfx::Rect& target_rect) OVERRIDE;
|
| - virtual void SetDrawViewport(const gfx::Rect& window_space_viewport) OVERRIDE;
|
| - virtual void SetScissorTestRect(const gfx::Rect& scissor_rect) OVERRIDE;
|
| + const gfx::Rect& target_rect) override;
|
| + virtual void SetDrawViewport(const gfx::Rect& window_space_viewport) override;
|
| + virtual void SetScissorTestRect(const gfx::Rect& scissor_rect) override;
|
| virtual void DiscardPixels(bool has_external_stencil_test,
|
| - bool draw_rect_covers_full_surface) OVERRIDE;
|
| + bool draw_rect_covers_full_surface) override;
|
| virtual void ClearFramebuffer(DrawingFrame* frame,
|
| - bool has_external_stencil_test) OVERRIDE;
|
| - virtual void DoDrawQuad(DrawingFrame* frame, const class DrawQuad*) OVERRIDE;
|
| - virtual void BeginDrawingFrame(DrawingFrame* frame) OVERRIDE;
|
| - virtual void FinishDrawingFrame(DrawingFrame* frame) OVERRIDE;
|
| - virtual bool FlippedFramebuffer() const OVERRIDE;
|
| - virtual void EnsureScissorTestEnabled() OVERRIDE;
|
| - virtual void EnsureScissorTestDisabled() OVERRIDE;
|
| + bool has_external_stencil_test) override;
|
| + virtual void DoDrawQuad(DrawingFrame* frame, const class DrawQuad*) override;
|
| + virtual void BeginDrawingFrame(DrawingFrame* frame) override;
|
| + virtual void FinishDrawingFrame(DrawingFrame* frame) override;
|
| + virtual bool FlippedFramebuffer() const override;
|
| + virtual void EnsureScissorTestEnabled() override;
|
| + virtual void EnsureScissorTestDisabled() override;
|
| virtual void CopyCurrentRenderPassToBitmap(
|
| DrawingFrame* frame,
|
| - scoped_ptr<CopyOutputRequest> request) OVERRIDE;
|
| - virtual void FinishDrawingQuadList() OVERRIDE;
|
| + scoped_ptr<CopyOutputRequest> request) override;
|
| + virtual void FinishDrawingQuadList() override;
|
|
|
| // Check if quad needs antialiasing and if so, inflate the quad and
|
| // fill edge array for fragment shader. local_quad is set to
|
| @@ -205,8 +205,8 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| void RestoreGLState();
|
| void RestoreFramebuffer(DrawingFrame* frame);
|
|
|
| - virtual void DiscardBackbuffer() OVERRIDE;
|
| - virtual void EnsureBackbuffer() OVERRIDE;
|
| + virtual void DiscardBackbuffer() override;
|
| + virtual void EnsureBackbuffer() override;
|
| void EnforceMemoryPolicy();
|
|
|
| void ScheduleOverlays(DrawingFrame* frame);
|
|
|