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/gammatext.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/gammatext.cpp')
-rw-r--r-- | gm/gammatext.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp index 036d04380b..ed8c82929d 100644 --- a/gm/gammatext.cpp +++ b/gm/gammatext.cpp @@ -39,11 +39,11 @@ static bool setFont(SkPaint* paint, const char name[]) { class GammaTextGM : public skiagm::GM { protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("gammatext"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(1024, HEIGHT); } @@ -58,7 +58,7 @@ protected: canvas->drawRect(r, paint); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { drawGrad(canvas); const SkColor fg[] = { @@ -137,28 +137,28 @@ public: } } - ~GammaShaderTextGM() SK_OVERRIDE { + ~GammaShaderTextGM() override { for (size_t i = 0; i < SK_ARRAY_COUNT(fShaders); ++i) { SkSafeUnref(fShaders[i]); } } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("gammagradienttext"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(300, 300); } - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { for (size_t i = 0; i < SK_ARRAY_COUNT(fShaders); ++i) { fShaders[i] = make_gradient(fColors[i]); } } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkPaint paint; paint.setAntiAlias(true); paint.setLCDRenderText(true); |