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

Unified Diff: cc/output/software_renderer.h

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted 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_unittest.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 deac838c28669fa4222255532e508a221e91b70d..d8b5a9d5abe9302f3f1d973652f3f06f1c706a23 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/software_renderer.h
@@ -33,34 +33,32 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
OutputSurface* output_surface,
ResourceProvider* resource_provider);
- virtual ~SoftwareRenderer();
- 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;
+ ~SoftwareRenderer() override;
+ const RendererCapabilitiesImpl& Capabilities() const override;
+ void Finish() override;
+ void SwapBuffers(const CompositorFrameMetadata& metadata) override;
+ void ReceiveSwapBuffersAck(const CompositorFrameAck& ack) override;
+ void DiscardBackbuffer() override;
+ void EnsureBackbuffer() override;
protected:
- 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;
- virtual void DiscardPixels(bool has_external_stencil_test,
- 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;
- virtual void CopyCurrentRenderPassToBitmap(
+ void BindFramebufferToOutputSurface(DrawingFrame* frame) override;
+ bool BindFramebufferToTexture(DrawingFrame* frame,
+ const ScopedResource* texture,
+ const gfx::Rect& target_rect) override;
+ void SetDrawViewport(const gfx::Rect& window_space_viewport) override;
+ void SetScissorTestRect(const gfx::Rect& scissor_rect) override;
+ void DiscardPixels(bool has_external_stencil_test,
+ bool draw_rect_covers_full_surface) override;
+ void ClearFramebuffer(DrawingFrame* frame,
+ bool has_external_stencil_test) override;
+ void DoDrawQuad(DrawingFrame* frame, const DrawQuad* quad) override;
+ void BeginDrawingFrame(DrawingFrame* frame) override;
+ void FinishDrawingFrame(DrawingFrame* frame) override;
+ bool FlippedFramebuffer() const override;
+ void EnsureScissorTestEnabled() override;
+ void EnsureScissorTestDisabled() override;
+ void CopyCurrentRenderPassToBitmap(
DrawingFrame* frame,
scoped_ptr<CopyOutputRequest> request) override;
@@ -69,7 +67,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
OutputSurface* output_surface,
ResourceProvider* resource_provider);
- virtual void DidChangeVisibility() override;
+ void DidChangeVisibility() override;
private:
void ClearCanvas(SkColor color);
« no previous file with comments | « cc/output/renderer_unittest.cc ('k') | cc/output/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698