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 --- bench/TextBench.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bench/TextBench.cpp') diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp index 0a6af34d8f..2d051c93ed 100644 --- a/bench/TextBench.cpp +++ b/bench/TextBench.cpp @@ -90,7 +90,7 @@ protected: } - virtual const char* onGetName() { + const char* onGetName() override { fName.printf("text_%g", SkScalarToFloat(fPaint.getTextSize())); if (fDoPos) { fName.append("_pos"); @@ -109,7 +109,7 @@ protected: return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) { + void onDraw(const int loops, SkCanvas* canvas) override { const SkIPoint dim = this->getSize(); SkRandom rand; -- cgit v1.2.3