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/xfermodes2.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/xfermodes2.cpp') diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 98e6f3a85c..493a0c0802 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -18,15 +18,15 @@ public: Xfermodes2GM() {} protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("xfermodes2"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(455, 475); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { canvas->translate(SkIntToScalar(10), SkIntToScalar(20)); const SkScalar w = SkIntToScalar(kSize); @@ -86,7 +86,7 @@ protected: } private: - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { static const uint32_t kCheckData[] = { SkPackARGB32(0xFF, 0x40, 0x40, 0x40), SkPackARGB32(0xFF, 0xD0, 0xD0, 0xD0), -- cgit v1.2.3