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

Unified Diff: bench/ETCBitmapBench.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
« no previous file with comments | « bench/DisplacementBench.cpp ('k') | bench/FSRectBench.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/ETCBitmapBench.cpp
diff --git a/bench/ETCBitmapBench.cpp b/bench/ETCBitmapBench.cpp
index 351b0ea09fabef0a73311f8d1c1ac8c0a9c1cda7..1cc61e61575249b5fb66722b1e5b5d938aa10d49 100644
--- a/bench/ETCBitmapBench.cpp
+++ b/bench/ETCBitmapBench.cpp
@@ -122,12 +122,12 @@ public:
ETCBitmapBench(bool decompress, Backend backend)
: fDecompress(decompress), fBackend(backend) { }
- bool isSuitableFor(Backend backend) SK_OVERRIDE {
+ bool isSuitableFor(Backend backend) override {
return backend == this->fBackend;
}
protected:
- const char* onGetName() SK_OVERRIDE {
+ const char* onGetName() override {
if (kGPU_Backend == this->fBackend) {
if (this->fDecompress) {
return "etc1bitmap_render_gpu_decompressed";
@@ -144,7 +144,7 @@ protected:
}
}
- void onPreDraw() SK_OVERRIDE {
+ void onPreDraw() override {
if (NULL == fPKMData) {
SkDebugf("Failed to load PKM data!\n");
return;
@@ -162,7 +162,7 @@ protected:
}
}
- void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(const int loops, SkCanvas* canvas) override {
for (int i = 0; i < loops; ++i) {
canvas->drawBitmap(this->fBitmap, 0, 0, NULL);
}
@@ -187,7 +187,7 @@ public:
: ETCBitmapBench(decompress, backend) { }
protected:
- const char* onGetName() SK_OVERRIDE {
+ const char* onGetName() override {
if (kGPU_Backend == this->backend()) {
if (this->decompress()) {
return "etc1bitmap_upload_gpu_decompressed";
@@ -204,7 +204,7 @@ protected:
}
}
- void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(const int loops, SkCanvas* canvas) override {
SkPixelRef* pr = fBitmap.pixelRef();
for (int i = 0; i < loops; ++i) {
if (pr) {
« no previous file with comments | « bench/DisplacementBench.cpp ('k') | bench/FSRectBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698