diff options
| author |  tfarina <tfarina@chromium.org> | 2014-12-20 06:53:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-20 06:53:43 -0800 |
| commit | 752e7eb157f8a18c26b88b7b85eecdbd5549d52e (patch) | |
| tree | 796bd41d42d1ebc0dfb65c01173d974b60aebaf8 /gm/tilemodes_scaled.cpp | |
| parent | bb1af8dd75c1db1a4bec34e584d552ebbcb1fedc (diff) | |
Cleanup: Another round of override fixes.
BUG=skia:3075
TEST=ninja -C out/Debug
TBR=mtklein@google.com
Review URL: https://codereview.chromium.org/815883002
Diffstat (limited to 'gm/tilemodes_scaled.cpp')
| -rw-r--r-- | gm/tilemodes_scaled.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp index 93a3db3f90..32f640acaa 100644 --- a/gm/tilemodes_scaled.cpp +++ b/gm/tilemodes_scaled.cpp @@ -65,7 +65,7 @@ protected: kNPOTSize = 3, }; - SkString onShortName() { + SkString onShortName() SK_OVERRIDE { SkString name("scaled_tilemodes"); if (!fPowerOfTwoSize) { name.append("_npot"); @@ -80,7 +80,7 @@ protected: } #endif - SkISize onISize() { return SkISize::Make(880, 760); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 760); } virtual void onOnceBeforeDraw() SK_OVERRIDE { int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize; @@ -90,7 +90,6 @@ protected: } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { - float scale = 32.f/kPOTSize; int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize; @@ -218,13 +217,13 @@ protected: return kSkipTiled_Flag; } - SkString onShortName() { + SkString onShortName() SK_OVERRIDE { return fName; } - SkISize onISize() { return SkISize::Make(880, 560); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2); const SkScalar w = SkIntToScalar(gWidth); |