aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/CachedDecodingPixelRefTest.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /tests/CachedDecodingPixelRefTest.cpp
parent02fd592c8d190058652bb715fb34feb7a72992e5 (diff)
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'tests/CachedDecodingPixelRefTest.cpp')
-rw-r--r--tests/CachedDecodingPixelRefTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index ddc0994e56..fc56edd823 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) {