Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(549)

Unified Diff: cc/output/software_renderer.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/software_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/software_renderer.h
diff --git a/cc/output/software_renderer.h b/cc/output/software_renderer.h
index 5c9fef0ba57d9cf94cb08428c004b5d716a44eb7..deac838c28669fa4222255532e508a221e91b70d 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/software_renderer.h
@@ -34,42 +34,42 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
ResourceProvider* resource_provider);
virtual ~SoftwareRenderer();
- virtual const RendererCapabilitiesImpl& Capabilities() const OVERRIDE;
- virtual void Finish() OVERRIDE;
- virtual void SwapBuffers(const CompositorFrameMetadata& metadata) OVERRIDE;
+ virtual const RendererCapabilitiesImpl& Capabilities() const override;
+ virtual void Finish() override;
+ virtual void SwapBuffers(const CompositorFrameMetadata& metadata) override;
virtual void ReceiveSwapBuffersAck(
- const CompositorFrameAck& ack) OVERRIDE;
- virtual void DiscardBackbuffer() OVERRIDE;
- virtual void EnsureBackbuffer() OVERRIDE;
+ const CompositorFrameAck& ack) override;
+ virtual void DiscardBackbuffer() override;
+ virtual void EnsureBackbuffer() override;
protected:
- virtual void BindFramebufferToOutputSurface(DrawingFrame* frame) OVERRIDE;
+ virtual void BindFramebufferToOutputSurface(DrawingFrame* frame) override;
virtual bool BindFramebufferToTexture(
DrawingFrame* frame,
const ScopedResource* texture,
- 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 DrawQuad* quad) 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 DrawQuad* quad) 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;
+ scoped_ptr<CopyOutputRequest> request) override;
SoftwareRenderer(RendererClient* client,
const LayerTreeSettings* settings,
OutputSurface* output_surface,
ResourceProvider* resource_provider);
- virtual void DidChangeVisibility() OVERRIDE;
+ virtual void DidChangeVisibility() override;
private:
void ClearCanvas(SkColor color);
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698