From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: 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 --- gm/strokes.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gm/strokes.cpp') diff --git a/gm/strokes.cpp b/gm/strokes.cpp index cadd0d6d9e..a258dfe005 100644 --- a/gm/strokes.cpp +++ b/gm/strokes.cpp @@ -40,15 +40,15 @@ public: protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("strokes_round"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(W, H*2); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(SkIntToScalar(9)/2); @@ -81,7 +81,7 @@ private: class Strokes2GM : public skiagm::GM { SkPath fPath; protected: - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { SkRandom rand; fPath.moveTo(0, 0); for (int i = 0; i < 13; i++) { @@ -92,11 +92,11 @@ protected: } - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("strokes_poly"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(W, H*2); } @@ -106,7 +106,7 @@ protected: canvas->concat(matrix); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { canvas->drawColor(SK_ColorWHITE); SkPaint paint; @@ -190,15 +190,15 @@ public: protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("strokes3"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(1500, 1500); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkPaint origPaint; origPaint.setAntiAlias(true); origPaint.setStyle(SkPaint::kStroke_Style); -- cgit v1.2.3