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

Unified Diff: gm/composeshader.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 | « gm/complexclip2.cpp ('k') | gm/concavepaths.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/composeshader.cpp
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index 76ff8edfc42a9e6ca4a651c152710fd02c9c711a..8933cf39653d956d684ee4256cc0ff3623f60721 100644
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -49,15 +49,15 @@ public:
}
protected:
- SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() override {
return SkString("composeshader");
}
- SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() override {
return SkISize::Make(120, 120);
}
- void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) override {
SkPaint paint;
@@ -79,15 +79,15 @@ public:
ComposeShaderAlphaGM() {}
protected:
- SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() override {
return SkString("composeshader_alpha");
}
- SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() override {
return SkISize::Make(220, 750);
}
- void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) override {
SkAutoTUnref<SkShader> shader0(make_shader(SkXfermode::kDstIn_Mode));
SkAutoTUnref<SkShader> shader1(make_shader(SkXfermode::kSrcOver_Mode));
SkShader* shaders[] = { shader0.get(), shader1.get() };
« no previous file with comments | « gm/complexclip2.cpp ('k') | gm/concavepaths.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698