diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /bench/ColorFilterBench.cpp | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (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 'bench/ColorFilterBench.cpp')
-rw-r--r-- | bench/ColorFilterBench.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp index b8cfbc3a80..04803b57b3 100644 --- a/bench/ColorFilterBench.cpp +++ b/bench/ColorFilterBench.cpp @@ -68,11 +68,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_dim_bright_small" : "colorfilter_dim_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -98,11 +98,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_bright_gray_small" : "colorfilter_bright_gray_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -125,11 +125,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_gray_bright_small" : "colorfilter_gray_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -152,11 +152,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_blue_bright_small" : "colorfilter_blue_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -179,11 +179,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_bright_blue_small" : "colorfilter_bright_blue_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -206,11 +206,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_bright_small" : "colorfilter_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -232,11 +232,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_blue_small" : "colorfilter_blue_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -258,11 +258,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_gray_small" : "colorfilter_gray_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -284,11 +284,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "table_colorfilter_small" : "table_colorfilter_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -322,11 +322,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "luma_colorfilter_small" : "luma_colorfilter_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); |