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 --- bench/PicturePlaybackBench.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bench/PicturePlaybackBench.cpp') diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp index 67945ce001..e11d7c8360 100644 --- a/bench/PicturePlaybackBench.cpp +++ b/bench/PicturePlaybackBench.cpp @@ -72,7 +72,7 @@ class TextPlaybackBench : public PicturePlaybackBench { public: TextPlaybackBench() : INHERITED("drawText") { } protected: - void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { + void recordCanvas(SkCanvas* canvas) override { SkPaint paint; paint.setTextSize(fTextSize); paint.setColor(SK_ColorBLACK); @@ -97,7 +97,7 @@ public: : INHERITED(drawPosH ? "drawPosTextH" : "drawPosText") , fDrawPosH(drawPosH) { } protected: - void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { + void recordCanvas(SkCanvas* canvas) override { SkPaint paint; paint.setTextSize(fTextSize); paint.setColor(SK_ColorBLACK); @@ -159,10 +159,10 @@ public: } } - const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(1024,1024); } + const char* onGetName() override { return fName.c_str(); } + SkIPoint onGetSize() override { return SkIPoint::Make(1024,1024); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkAutoTDelete factory; switch (fBBH) { case kNone: break; @@ -185,7 +185,7 @@ public: fPic.reset(recorder.endRecording()); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; i++) { // This inner loop guarantees we make the same choices for all bench variants. SkRandom rand; -- cgit v1.2.3