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 /gm/composeshader.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 'gm/composeshader.cpp')
-rw-r--r-- | gm/composeshader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index 76ff8edfc4..8933cf3965 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() }; |