From f059900f75639f1b1a03f2c25333ef9aa22d58b8 Mon Sep 17 00:00:00 2001 From: mtklein Date: Mon, 13 Jul 2015 06:18:39 -0700 Subject: Fix up -Winconsistent-missing-override (and a couple presubmit fixes) This allows us to turn back on -Werror for LLVM coverage builds, and more generally supports building with Clang 3.7. No public API changes. TBR=reed@google.com BUG=skia: Review URL: https://codereview.chromium.org/1232463006 --- samplecode/SamplePathClip.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'samplecode/SamplePathClip.cpp') diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp index ab7ed5d0fc..494debfb4f 100644 --- a/samplecode/SamplePathClip.cpp +++ b/samplecode/SamplePathClip.cpp @@ -37,7 +37,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "PathClip"); return true; @@ -45,7 +45,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) { + void onDrawContent(SkCanvas* canvas) override { SkRect oval = fOval; oval.offset(fCenter.fX - oval.centerX(), fCenter.fY - oval.centerY()); @@ -74,7 +74,7 @@ protected: return new Click(this); } - virtual bool onClick(Click* click) { + bool onClick(Click* click) override { fCenter.set(click->fCurr.fX, click->fCurr.fY); this->inval(NULL); return false; -- cgit v1.2.3