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/SampleCamera.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'samplecode/SampleCamera.cpp') diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp index 1f3b8c33fb..991013a850 100644 --- a/samplecode/SampleCamera.cpp +++ b/samplecode/SampleCamera.cpp @@ -57,7 +57,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Camera"); return true; @@ -65,7 +65,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) { + void onDrawContent(SkCanvas* canvas) override { canvas->translate(this->width()/2, this->height()/2); Sk3DView view; -- cgit v1.2.3