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/LightingBench.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/LightingBench.cpp')
| -rw-r--r-- | bench/LightingBench.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp index ed0c9858ef..a56ed226e2 100644 --- a/bench/LightingBench.cpp +++ b/bench/LightingBench.cpp @@ -101,11 +101,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingpointlitdiffuse_small" : "lightingpointlitdiffuse_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreatePointLitDiffuse(getPointLocation(), getWhite(), getSurfaceScale(), @@ -122,11 +122,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingdistantlitdiffuse_small" : "lightingdistantlitdiffuse_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitDiffuse(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -143,11 +143,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingspotlitdiffuse_small" : "lightingspotlitdiffuse_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitDiffuse(getSpotLocation(), getSpotTarget(), getSpotExponent(), @@ -167,11 +167,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingpointlitspecular_small" : "lightingpointlitspecular_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreatePointLitSpecular(getPointLocation(), getWhite(), getSurfaceScale(), @@ -189,11 +189,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingdistantlitspecular_small" : "lightingdistantlitspecular_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitSpecular(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -211,11 +211,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingspotlitspecular_small" : "lightingspotlitspecular_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitSpecular(getSpotLocation(), getSpotTarget(), getSpotExponent(), |