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 | |
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')
-rw-r--r-- | gm/aaclip.cpp | 2 | ||||
-rw-r--r-- | gm/aarectmodes.cpp | 6 | ||||
-rw-r--r-- | gm/alphagradients.cpp | 2 | ||||
-rwxr-xr-x | gm/beziers.cpp | 6 | ||||
-rw-r--r-- | gm/bitmaprecttest.cpp | 4 | ||||
-rw-r--r-- | gm/bitmapscroll.cpp | 6 | ||||
-rw-r--r-- | gm/blurrect.cpp | 8 | ||||
-rw-r--r-- | gm/blurs.cpp | 6 | ||||
-rw-r--r-- | gm/circularclips.cpp | 6 | ||||
-rw-r--r-- | gm/clip_strokerect.cpp | 2 | ||||
-rw-r--r-- | gm/coloremoji.cpp | 6 | ||||
-rw-r--r-- | gm/filltypes.cpp | 7 | ||||
-rw-r--r-- | gm/filltypespersp.cpp | 8 | ||||
-rw-r--r-- | gm/filterbitmap.cpp | 2 | ||||
-rw-r--r-- | gm/filterindiabox.cpp | 2 | ||||
-rw-r--r-- | gm/fontmgr.cpp | 18 | ||||
-rw-r--r-- | gm/fontscaler.cpp | 6 | ||||
-rw-r--r-- | gm/getpostextpath.cpp | 6 | ||||
-rw-r--r-- | gm/giantbitmap.cpp | 6 | ||||
-rw-r--r-- | gm/glyph_pos.cpp | 2 | ||||
-rw-r--r-- | gm/glyph_pos_align.cpp | 2 | ||||
-rw-r--r-- | gm/gradients.cpp | 12 | ||||
-rw-r--r-- | gm/gradtext.cpp | 2 | ||||
-rw-r--r-- | gm/hairlines.cpp | 2 | ||||
-rw-r--r-- | gm/hittestpath.cpp | 6 | ||||
-rw-r--r-- | gm/imageblur.cpp | 6 | ||||
-rw-r--r-- | gm/imagefiltersclipped.cpp | 6 |
27 files changed, 72 insertions, 75 deletions
diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp index 6419c8f989..e7f7f7a42e 100644 --- a/gm/aaclip.cpp +++ b/gm/aaclip.cpp @@ -101,7 +101,7 @@ protected: draw_rect_tests(canvas); } - virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; } + virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } private: typedef skiagm::GM INHERITED; diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp index b2a28c1d52..041ae198a1 100644 --- a/gm/aarectmodes.cpp +++ b/gm/aarectmodes.cpp @@ -137,13 +137,13 @@ namespace skiagm { return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("aarectmodes"); } - virtual SkISize onISize() { return SkISize::Make(640, 480); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (false) { // avoid bit rot, suppress warning test4(canvas); } diff --git a/gm/alphagradients.cpp b/gm/alphagradients.cpp index d10828867d..1175911756 100644 --- a/gm/alphagradients.cpp +++ b/gm/alphagradients.cpp @@ -72,7 +72,7 @@ protected: } } - virtual uint32_t onGetFlags() const { return kSkipPipe_Flag | kSkipTiled_Flag; } + virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } private: typedef skiagm::GM INHERITED; diff --git a/gm/beziers.cpp b/gm/beziers.cpp index 2371fdd0eb..4fac17b6c8 100755 --- a/gm/beziers.cpp +++ b/gm/beziers.cpp @@ -50,15 +50,15 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("beziers"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(W, H*2); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(SkIntToScalar(9)/2); diff --git a/gm/bitmaprecttest.cpp b/gm/bitmaprecttest.cpp index 6f0ab58077..22962cbb1f 100644 --- a/gm/bitmaprecttest.cpp +++ b/gm/bitmaprecttest.cpp @@ -56,11 +56,11 @@ public: } protected: - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("bitmaprecttest"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(320, 240); } diff --git a/gm/bitmapscroll.cpp b/gm/bitmapscroll.cpp index d38cbbe435..dff5226a2d 100644 --- a/gm/bitmapscroll.cpp +++ b/gm/bitmapscroll.cpp @@ -59,7 +59,7 @@ public: } protected: - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("bitmapscroll"); } @@ -67,11 +67,11 @@ protected: return kSkipTiled_Flag; } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->init(); SkIRect scrollCenterRegion = SkIRect::MakeXYWH( quarterWidth, quarterHeight, quarterWidth*2+1, quarterHeight*2+1); diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index 49ef856c64..61e18bdbb1 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -101,15 +101,15 @@ protected: } } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(860, 820); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(STROKE_WIDTH*3/2, STROKE_WIDTH*3/2); SkRect r = { 0, 0, 100, 50 }; @@ -147,7 +147,7 @@ protected: } } - virtual uint32_t onGetFlags() const { return kSkipPipe_Flag | kSkipTiled_Flag; } + virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } private: void drawProcs(SkCanvas* canvas, const SkRect& r, const SkPaint& paint, diff --git a/gm/blurs.cpp b/gm/blurs.cpp index 74189330a3..dfa95ce397 100644 --- a/gm/blurs.cpp +++ b/gm/blurs.cpp @@ -20,15 +20,15 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("blurs"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 500); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkBlurStyle NONE = SkBlurStyle(-999); static const struct { SkBlurStyle fStyle; diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp index 4730182252..81803a3e78 100644 --- a/gm/circularclips.cpp +++ b/gm/circularclips.cpp @@ -29,15 +29,15 @@ protected: return kSkipTiled_Flag | kAsBench_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("circular-clips"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRegion::Op ops[] = { SkRegion::kDifference_Op, SkRegion::kIntersect_Op, diff --git a/gm/clip_strokerect.cpp b/gm/clip_strokerect.cpp index 707229214a..da79ed828b 100644 --- a/gm/clip_strokerect.cpp +++ b/gm/clip_strokerect.cpp @@ -63,7 +63,7 @@ protected: canvas->drawRect(rect2, p); } - virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; } + virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } private: typedef skiagm::GM INHERITED; diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index cc794f005e..51ac9239a6 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -65,15 +65,15 @@ protected: fTypeface = SkTypeface::CreateFromStream(stream); } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("coloremoji"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(650, 480); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(SK_ColorGRAY); diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp index 8859ea1191..dbbe4fefbd 100644 --- a/gm/filltypes.cpp +++ b/gm/filltypes.cpp @@ -29,17 +29,16 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("filltypes"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(835, 840); } void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft, SkScalar scale, const SkPaint& paint) { - const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) }; canvas->save(); @@ -65,7 +64,7 @@ protected: scale, paint); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->makePath(); canvas->translate(SkIntToScalar(20), SkIntToScalar(20)); diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp index 21def99c51..3fff059b2d 100644 --- a/gm/filltypespersp.cpp +++ b/gm/filltypespersp.cpp @@ -28,17 +28,16 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("filltypespersp"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(835, 840); } void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft, SkScalar scale, const SkPaint& paint) { - const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) }; canvas->save(); @@ -54,7 +53,6 @@ protected: } void showFour(SkCanvas* canvas, SkScalar scale, bool aa) { - SkPaint paint; SkPoint center = SkPoint::Make(SkIntToScalar(100), SkIntToScalar(100)); SkColor colors[] = {SK_ColorBLUE, SK_ColorRED, SK_ColorGREEN}; @@ -78,7 +76,7 @@ protected: scale, paint); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->makePath(); // do perspective drawPaint as the background; diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index d40f8bcd7c..b4c5f6ac30 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -43,7 +43,7 @@ static void draw_row(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat, } class FilterBitmapGM : public skiagm::GM { - void onOnceBeforeDraw() { + void onOnceBeforeDraw() SK_OVERRIDE { this->makeBitmap(); diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp index 6b662f064f..04e2087bf3 100644 --- a/gm/filterindiabox.cpp +++ b/gm/filterindiabox.cpp @@ -43,7 +43,7 @@ static void draw_row(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat, } class FilterIndiaBoxGM : public skiagm::GM { - void onOnceBeforeDraw() { + void onOnceBeforeDraw() SK_OVERRIDE { this->makeBitmap(); SkScalar cx = SkScalarHalf(fBM.width()); 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); diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp index eb38013cb1..6fd763cbe2 100644 --- a/gm/fontscaler.cpp +++ b/gm/fontscaler.cpp @@ -23,11 +23,11 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("fontscaler"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1450, 750); } @@ -39,7 +39,7 @@ protected: canvas->translate(-px, -py); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp index 45701071bb..8cad512c3c 100644 --- a/gm/getpostextpath.cpp +++ b/gm/getpostextpath.cpp @@ -20,11 +20,11 @@ protected: return kSkipTiled_Flag; } - SkString onShortName() { + SkString onShortName() SK_OVERRIDE { return SkString("getpostextpath"); } - SkISize onISize() { return SkISize::Make(480, 780); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(480, 780); } static void strokePath(SkCanvas* canvas, const SkPath& path) { SkPaint paint; @@ -34,7 +34,7 @@ protected: canvas->drawPath(path, paint); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { // explicitly add spaces, to test a prev. bug const char* text = "Ham bur ge fons"; int len = SkToInt(strlen(text)); diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp index de908fef34..87aee36daf 100644 --- a/gm/giantbitmap.cpp +++ b/gm/giantbitmap.cpp @@ -82,7 +82,7 @@ protected: #endif } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { SkString str("giantbitmap_"); switch (fMode) { case SkShader::kClamp_TileMode: @@ -102,9 +102,9 @@ protected: return str; } - virtual SkISize onISize() { return SkISize::Make(640, 480); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkMatrix m; diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp index ecb9963799..dd814cf28c 100644 --- a/gm/glyph_pos.cpp +++ b/gm/glyph_pos.cpp @@ -48,7 +48,7 @@ protected: return str; } - virtual SkISize onISize() { return SkISize::Make(800, 600); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (!fProp) { diff --git a/gm/glyph_pos_align.cpp b/gm/glyph_pos_align.cpp index 8877379217..3ce3a88781 100644 --- a/gm/glyph_pos_align.cpp +++ b/gm/glyph_pos_align.cpp @@ -29,7 +29,7 @@ protected: return SkString("glyph_pos_align"); } - virtual SkISize onISize() { return SkISize::Make(kWidth, kHeight); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, kHeight); } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->clear(SK_ColorBLACK); diff --git a/gm/gradients.cpp b/gm/gradients.cpp index fd02ceeae9..481b476e37 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -338,12 +338,12 @@ protected: return kSkipTiled_Flag; } - SkString onShortName() { return SkString("radial_gradient"); } - virtual SkISize onISize() { return SkISize::Make(1280, 1280); } + SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient"); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { const SkISize dim = this->getISize(); this->drawBG(canvas); @@ -381,14 +381,14 @@ protected: return kSkipTiled_Flag; } - SkString onShortName() { return SkString("radial_gradient2"); } - virtual SkISize onISize() { return SkISize::Make(800, 400); } + SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient2"); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } // Reproduces the example given in bug 7671058. - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint1, paint2, paint3; paint1.setStyle(SkPaint::kFill_Style); paint2.setStyle(SkPaint::kFill_Style); diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp index 47440f6d18..11dc29cc21 100644 --- a/gm/gradtext.cpp +++ b/gm/gradtext.cpp @@ -102,7 +102,7 @@ public: GradTextGM () {} protected: - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("gradtext"); } diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp index df67412dfe..9a0b8d55ce 100644 --- a/gm/hairlines.cpp +++ b/gm/hairlines.cpp @@ -22,7 +22,7 @@ protected: return SkString("hairlines"); } - virtual SkISize onISize() { return SkISize::Make(1250, 1250); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1250, 1250); } virtual void onOnceBeforeDraw() SK_OVERRIDE { { diff --git a/gm/hittestpath.cpp b/gm/hittestpath.cpp index caed98fc95..88772d6327 100644 --- a/gm/hittestpath.cpp +++ b/gm/hittestpath.cpp @@ -38,13 +38,13 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("hittestpath"); } - virtual SkISize onISize() { return SkISize::Make(700, 460); } + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPath path; SkRandom rand; diff --git a/gm/imageblur.cpp b/gm/imageblur.cpp index 2e856781d3..67dca07779 100644 --- a/gm/imageblur.cpp +++ b/gm/imageblur.cpp @@ -27,15 +27,15 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setImageFilter(SkBlurImageFilter::Create(fSigmaX, fSigmaY))->unref(); canvas->saveLayer(NULL, &paint); diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index ae53a2e3ba..74bd2ad2fb 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -35,11 +35,11 @@ protected: return kSkipTiled_Flag; } - virtual SkString onShortName() { + virtual SkString onShortName() SK_OVERRIDE { return SkString("imagefiltersclipped"); } - virtual SkISize onISize() { + virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(860, 500); } @@ -83,7 +83,7 @@ protected: canvas.drawCircle(x, y, radius, paint); } - virtual void onDraw(SkCanvas* canvas) { + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (!fInitialized) { this->make_checkerboard(); this->make_gradient_circle(64, 64); |