Index: bench/ColorFilterBench.cpp |
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp |
index b8cfbc3a80e23bb37272a5a7fa922980b94ea0f9..04803b57b3a6ce85b1f92382086ed3fcc1c0c59c 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); |