diff options
Diffstat (limited to 'gm/fontmgr.cpp')
| -rw-r--r-- | gm/fontmgr.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index a7ff8a8620..9d0e3509f1 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -68,15 +68,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1536, 768); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar y = 20; SkPaint paint; paint.setAntiAlias(true); @@ -115,7 +115,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // fontdescriptors (and therefore serialization) don't yet understand // these new styles, so skip tests that exercise that for now. @@ -140,11 +140,11 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("fontmgr_match"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 1024); } @@ -186,7 +186,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setLCDRenderText(true); @@ -214,7 +214,7 @@ protected: this->iterateFamily(canvas, paint, fset); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // fontdescriptors (and therefore serialization) don't yet understand // these new styles, so skip tests that exercise that for now. return kSkipPicture_Flag | kSkipPipe_Flag; @@ -253,15 +253,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 850); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setSubpixelText(true); @@ -300,7 +300,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // fontdescriptors (and therefore serialization) don't yet understand // these new styles, so skip tests that exercise that for now. |