content/browser/compositor/software_output_device_win.h - Issue 1091093006: Update {virtual,override} to follow C++11 style in content.

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/software_output_device_win.h

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Back out some webrtc files. Created 5 years, 8 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/accessibility/browser_accessibility_win_unittest.cc ('k') | content/browser/frame_host/interstitial_page_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/software_output_device_win.h

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

index 85873fb12b6c248b953e643e3b1e9aec1c41db09..a171e8e0fc63df94f45c42ab1da1b44625b4568c 100644

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

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

@@ -23,13 +23,13 @@ namespace content {

class SoftwareOutputDeviceWin : public cc::SoftwareOutputDevice {

public:

explicit SoftwareOutputDeviceWin(ui::Compositor* compositor);

- virtual ~SoftwareOutputDeviceWin();

+ ~SoftwareOutputDeviceWin() override;

- virtual void Resize(const gfx::Size& viewport_pixel_size,

- float scale_factor) override;

- virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;

- virtual void EndPaint(cc::SoftwareFrameData* frame_data) override;

- virtual void CopyToPixels(const gfx::Rect& rect, void* pixels) override;

+ void Resize(const gfx::Size& viewport_pixel_size,

+ float scale_factor) override;

+ SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;

+ void EndPaint(cc::SoftwareFrameData* frame_data) override;

+ void CopyToPixels(const gfx::Rect& rect, void* pixels) override;

private:

HWND hwnd_;