| Index: bench/DisplacementBench.cpp
|
| diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp
|
| index 2f9a69e0f82650e9de2dfa90705511cd94629407..b9070cb9e057db3ae03298477b0015ccffd02ea7 100644
|
| --- a/bench/DisplacementBench.cpp
|
| +++ b/bench/DisplacementBench.cpp
|
| @@ -22,7 +22,7 @@ public:
|
| }
|
|
|
| protected:
|
| - void onPreDraw() SK_OVERRIDE {
|
| + void onPreDraw() override {
|
| if (!fInitialized) {
|
| this->makeBitmap();
|
| this->makeCheckerboard();
|
| @@ -91,11 +91,11 @@ public:
|
| }
|
|
|
| protected:
|
| - const char* onGetName() SK_OVERRIDE {
|
| + const char* onGetName() override {
|
| return this->isSmall() ? "displacement_zero_small" : "displacement_zero_large";
|
| }
|
|
|
| - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(const int loops, SkCanvas* canvas) override {
|
| SkPaint paint;
|
| SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard));
|
| // No displacement effect
|
| @@ -118,11 +118,11 @@ public:
|
| }
|
|
|
| protected:
|
| - const char* onGetName() SK_OVERRIDE {
|
| + const char* onGetName() override {
|
| return isSmall() ? "displacement_alpha_small" : "displacement_alpha_large";
|
| }
|
|
|
| - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(const int loops, SkCanvas* canvas) override {
|
| SkPaint paint;
|
| SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard));
|
| // Displacement, with 1 alpha component (which isn't pre-multiplied)
|
| @@ -144,11 +144,11 @@ public:
|
| }
|
|
|
| protected:
|
| - const char* onGetName() SK_OVERRIDE {
|
| + const char* onGetName() override {
|
| return isSmall() ? "displacement_full_small" : "displacement_full_large";
|
| }
|
|
|
| - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(const int loops, SkCanvas* canvas) override {
|
| SkPaint paint;
|
| SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard));
|
| // Displacement, with 2 non-alpha components
|
|
|