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/SampleTextAlpha.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'samplecode/SampleTextAlpha.cpp') diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp index 58e1db2686..f3440213ef 100644 --- a/samplecode/SampleTextAlpha.cpp +++ b/samplecode/SampleTextAlpha.cpp @@ -36,7 +36,7 @@ public: protected: // overrides from SkEventSink - bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "TextAlpha"); return true; @@ -44,7 +44,7 @@ protected: return this->INHERITED::onQuery(evt); } - void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) override { const char* str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; SkPaint paint; SkScalar x = SkIntToScalar(10); @@ -69,11 +69,11 @@ protected: } } - SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) override { return new Click(this); } - bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) override { int y = click->fICurr.fY; if (y < 0) { y = 0; -- cgit v1.2.3