diff options
author | tfarina <tfarina@chromium.org> | 2015-01-05 17:18:51 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-05 17:18:51 -0800 |
commit | aa458fb20a4350da581f8ceec69ea16eec295ced (patch) | |
tree | db81877fcdf6d4bf361ddfce5f81072ea5cc996b /bench | |
parent | 4dd6b72b31d091968c6cc92558684d87cc7b2008 (diff) |
Cleanup: More override fixes - another round.
BUG=skia:3075
TEST=ninja -C out/Debug
TBR=reed@google.com
Review URL: https://codereview.chromium.org/831113002
Diffstat (limited to 'bench')
-rw-r--r-- | bench/PremulAndUnpremulAlphaOpsBench.cpp | 2 | ||||
-rw-r--r-- | bench/RectoriBench.cpp | 2 | ||||
-rw-r--r-- | bench/RefCntBench.cpp | 8 | ||||
-rw-r--r-- | bench/RegionContainBench.cpp | 4 | ||||
-rw-r--r-- | bench/ScalarBench.cpp | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/bench/PremulAndUnpremulAlphaOpsBench.cpp b/bench/PremulAndUnpremulAlphaOpsBench.cpp index 6ab585e729..32f749c366 100644 --- a/bench/PremulAndUnpremulAlphaOpsBench.cpp +++ b/bench/PremulAndUnpremulAlphaOpsBench.cpp @@ -29,7 +29,7 @@ protected: return fName.c_str(); } - virtual void onPreDraw() { + virtual void onPreDraw() SK_OVERRIDE { SkImageInfo info = SkImageInfo::Make(W, H, fColorType, kUnpremul_SkAlphaType); fBmp1.allocPixels(info); // used in writePixels diff --git a/bench/RectoriBench.cpp b/bench/RectoriBench.cpp index 5c115115e3..ab9bdd598c 100644 --- a/bench/RectoriBench.cpp +++ b/bench/RectoriBench.cpp @@ -20,7 +20,7 @@ public: protected: - virtual const char* onGetName() { + virtual const char* onGetName() SK_OVERRIDE { return "rectori"; } diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp index f846b1ac60..d440d99db2 100644 --- a/bench/RefCntBench.cpp +++ b/bench/RefCntBench.cpp @@ -191,11 +191,11 @@ public: } protected: - virtual const char* onGetName() { + virtual const char* onGetName() SK_OVERRIDE { return "ref_cnt_heap_weak"; } - virtual void onDraw(const int loops, SkCanvas*) { + virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { char memory[sizeof(PlacedWeakRefCnt)]; for (int i = 0; i < loops; ++i) { PlacedWeakRefCnt* ref = new (memory) PlacedWeakRefCnt(); @@ -218,11 +218,11 @@ public: } protected: - virtual const char* onGetName() { + virtual const char* onGetName() SK_OVERRIDE { return "ref_cnt_new_weak"; } - virtual void onDraw(const int loops, SkCanvas*) { + virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { for (int i = 0; i < loops; ++i) { SkWeakRefCnt* ref = new SkWeakRefCnt(); for (int j = 0; j < M; ++j) { diff --git a/bench/RegionContainBench.cpp b/bench/RegionContainBench.cpp index a47ab3395f..f6d8142846 100644 --- a/bench/RegionContainBench.cpp +++ b/bench/RegionContainBench.cpp @@ -50,9 +50,9 @@ public: } protected: - virtual const char* onGetName() { return fName.c_str(); } + virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas*) { + virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { Proc proc = fProc; for (int i = 0; i < loops; ++i) { diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp index e09fa7533b..92608123ee 100644 --- a/bench/ScalarBench.cpp +++ b/bench/ScalarBench.cpp @@ -31,7 +31,7 @@ protected: return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) { + virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int i = 0; i < loops; i++) { this->performTest(); } @@ -101,7 +101,7 @@ public: } } protected: - virtual int mulLoopCount() const { return 1; } + virtual int mulLoopCount() const SK_OVERRIDE { return 1; } virtual void performTest() SK_OVERRIDE { int sum = 0; for (size_t i = 0; i < ARRAY_N; ++i) { |