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 --- samplecode/SampleShaders.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'samplecode/SampleShaders.cpp') diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp index 5a358c6af9..093e14f4eb 100644 --- a/samplecode/SampleShaders.cpp +++ b/samplecode/SampleShaders.cpp @@ -83,7 +83,7 @@ public: protected: // overrides from SkEventSink - bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Shaders"); return true; @@ -91,7 +91,7 @@ protected: return this->INHERITED::onQuery(evt); } - void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) override { canvas->drawBitmap(fBitmap, 0, 0); canvas->translate(SkIntToScalar(20), SkIntToScalar(120)); @@ -122,12 +122,12 @@ protected: } virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, - unsigned modi) SK_OVERRIDE { + unsigned modi) override { this->inval(NULL); return this->INHERITED::onFindClickHandler(x, y, modi); } - bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) override { return this->INHERITED::onClick(click); } -- cgit v1.2.3