Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Unified Diff: bench/LightingBench.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/InterpBench.cpp ('k') | bench/LineBench.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/LightingBench.cpp
diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp
index ed0c9858ef5c19cdb6bf599e1707e2705024f377..a56ed226e2441a0ae6a6a2409672eb6b964dc109 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(),
« no previous file with comments | « bench/InterpBench.cpp ('k') | bench/LineBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698