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/gradients_no_texture.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gm/gradients_no_texture.cpp') diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index c180209498..8b97b25ef6 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -86,10 +86,10 @@ public: protected: - SkString onShortName() SK_OVERRIDE { return SkString("gradients_no_texture"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); } + SkString onShortName() override { return SkString("gradients_no_texture"); } + SkISize onISize() override { return SkISize::Make(640, 615); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { static const SkPoint kPts[2] = { { 0, 0 }, { SkIntToScalar(50), SkIntToScalar(50) } }; static const SkShader::TileMode kTM = SkShader::kClamp_TileMode; @@ -209,10 +209,10 @@ public: protected: - SkString onShortName() SK_OVERRIDE { return SkString("gradients_many"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); } + SkString onShortName() override { return SkString("gradients_many"); } + SkISize onISize() override { return SkISize::Make(850, 100); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { const Proc procs[] = { make0, make1, make2, }; -- cgit v1.2.3