content/browser/compositor/surface_display_output_surface.h - Issue 667943003: Standardize usage of virtual/override/final in content/browser/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/compositor/surface_display_output_surface.h

Issue 667943003: Standardize usage of virtual/override/final in content/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « content/browser/compositor/software_output_device_mac.h ('k') | content/browser/compositor/test/no_transport_image_transport_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/surface_display_output_surface.h

diff --git a/content/browser/compositor/surface_display_output_surface.h b/content/browser/compositor/surface_display_output_surface.h

index ac1a3e2112d209156b0946b1414ddabac6840bd9..698b9f5553c2ed9adfcf65200920b324dd92105e 100644

--- a/content/browser/compositor/surface_display_output_surface.h

+++ b/content/browser/compositor/surface_display_output_surface.h

@@ -29,7 +29,7 @@ class SurfaceDisplayOutputSurface : public cc::OutputSurface,

cc::SurfaceManager* surface_manager,

cc::SurfaceIdAllocator* allocator,

const scoped_refptr<cc::ContextProvider>& context_provider);

- virtual ~SurfaceDisplayOutputSurface();

+ ~SurfaceDisplayOutputSurface() override;

void set_display_client(OnscreenDisplayClient* display_client) {

display_client_ = display_client;

@@ -39,12 +39,11 @@ class SurfaceDisplayOutputSurface : public cc::OutputSurface,

base::TimeDelta interval);

// cc::OutputSurface implementation.

- virtual void SwapBuffers(cc::CompositorFrame* frame) override;

- virtual bool BindToClient(cc::OutputSurfaceClient* client) override;

+ void SwapBuffers(cc::CompositorFrame* frame) override;

+ bool BindToClient(cc::OutputSurfaceClient* client) override;

// cc::SurfaceFactoryClient implementation.

- virtual void ReturnResources(

- const cc::ReturnedResourceArray& resources) override;

+ void ReturnResources(const cc::ReturnedResourceArray& resources) override;

private:

void SwapBuffersComplete();