tests/CachedDecodingPixelRefTest.cpp - Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

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: tests/CachedDecodingPixelRefTest.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: git cl web Created 5 years, 9 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

Index: tests/CachedDecodingPixelRefTest.cpp

diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp

index ddc0994e56d44caf1d6d0b9ed6d1a7d3ab2cad1b..fc56edd82365e98beca615290550367582cec898 100644

--- a/tests/CachedDecodingPixelRefTest.cpp

+++ b/tests/CachedDecodingPixelRefTest.cpp

@@ -183,7 +183,7 @@ protected:

}

#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO

- bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {

+ bool onGetInfo(SkImageInfo* info) override {

REPORTER_ASSERT(fReporter, info);

*info = GetMyInfo();

return true;

@@ -192,7 +192,7 @@ protected:

virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,

const Options&,

- SkPMColor ctable[], int* ctableCount) SK_OVERRIDE {

+ SkPMColor ctable[], int* ctableCount) override {

REPORTER_ASSERT(fReporter, pixels != NULL);

REPORTER_ASSERT(fReporter, rowBytes >= info.minRowBytes());

if (fType != kSucceedGetPixels_TestType) {

« no previous file with comments | « tests/BitmapHeapTest.cpp ('k') | tests/CanvasStateTest.cpp » ('j') | no next file with comments »