diff options
author | tfarina <tfarina@chromium.org> | 2015-01-05 17:18:51 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-05 17:18:51 -0800 |
commit | aa458fb20a4350da581f8ceec69ea16eec295ced (patch) | |
tree | db81877fcdf6d4bf361ddfce5f81072ea5cc996b /gm/fontmgr.cpp | |
parent | 4dd6b72b31d091968c6cc92558684d87cc7b2008 (diff) |
Cleanup: More override fixes - another round.
BUG=skia:3075
TEST=ninja -C out/Debug
TBR=reed@google.com
Review URL: https://codereview.chromium.org/831113002
Diffstat (limited to 'gm/fontmgr.cpp')
-rw-r--r-- | gm/fontmgr.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index 865090a4c4..a7ff8a8620 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -68,11 +68,11 @@ public: } protected: - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1536, 768); } @@ -140,11 +140,11 @@ public: } protected: - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("fontmgr_match"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 1024); } @@ -244,7 +244,7 @@ public: for (int i = 0; str[i]; ++i) { canvas->drawText(&str[i], 1, x, y, paint); } - + SkRect r = paint.getFontBounds(); r.offset(x, y); SkPaint p(paint); @@ -253,14 +253,14 @@ public: } protected: - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return fName; } - - virtual SkISize onISize() { + + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 850); } - + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); |