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

5 files changed, 81 insertions, 81 deletions

diff --git a/gm/bitmapshader.cpp b/gm/bitmapshader.cpp
index 1d866c6010..3e66456616 100644
--- a/gm/bitmapshader.cpp
+++ b/gm/bitmapshader.cpp
@@ -49,15 +49,15 @@ protected:
         draw_mask(&fMask);
     }
 
-    virtual SkString onShortName() {
+    SkString onShortName() override {
         return SkString("bitmapshaders");
     }
 
-    virtual SkISize onISize() {
+    SkISize onISize() override {
         return SkISize::Make(150, 100);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
 
         for (int i = 0; i < 2; i++) {
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index dfec4e73e1..9357884c6e 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -118,7 +118,7 @@ protected:
         return "";
     }
 
-    virtual SkString onShortName() {
+    SkString onShortName() override {
         if (kRect_Clip == fClip && !fAntiAlias) {
             return SkString("complexclip2");
         }
@@ -130,12 +130,12 @@ protected:
         return str;
     }
 
-    virtual SkISize onISize() {
+    SkISize onISize() override {
         return SkISize::Make(SkScalarRoundToInt(fTotalWidth),
                              SkScalarRoundToInt(fTotalHeight));
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    void onDraw(SkCanvas* canvas) override {
         SkPaint rectPaint;
         rectPaint.setStyle(SkPaint::kStroke_Style);
         rectPaint.setStrokeWidth(-1);
diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp
index 786f5eb0bd..b26c750e9a 100644
--- a/gm/dcshader.cpp
+++ b/gm/dcshader.cpp
@@ -70,7 +70,7 @@ public:
                             const char* outputColor,
                             const char* inputColor,
                             const TransformedCoordsArray& coords,
-                            const TextureSamplerArray& samplers) {
+                            const TextureSamplerArray& samplers) override {
                 GrGLFragmentBuilder* fpb = builder->getFragmentShaderBuilder();
                 fpb->codeAppendf("vec2 c = %s;", fpb->ensureFSCoords2D(coords, 0).c_str());
                 fpb->codeAppend("vec2 r = mod(c, vec2(20.0));");
diff --git a/gm/shadows.cpp b/gm/shadows.cpp
index 5c0e1e123a..729104c980 100644
--- a/gm/shadows.cpp
+++ b/gm/shadows.cpp
@@ -36,84 +36,84 @@ protected:
                   SkIntToScalar(30), SkIntToScalar(30));
     }
 
-    virtual SkString onShortName() {
+    SkString onShortName() override {
         return SkString("shadows");
     }
 
-    virtual SkISize onISize() {
+    SkISize onISize() override {
         return SkISize::Make(200, 120);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
-    SkBlurDrawLooper* shadowLoopers[5];
-    shadowLoopers[0] =
-        SkBlurDrawLooper::Create(SK_ColorBLUE,
-                                 SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)),
-                                 SkIntToScalar(5), SkIntToScalar(10),
-                                 SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
-                                 SkBlurDrawLooper::kOverrideColor_BlurFlag |
-                                 SkBlurDrawLooper::kHighQuality_BlurFlag);
-    SkAutoUnref aurL0(shadowLoopers[0]);
-    shadowLoopers[1] =
-        SkBlurDrawLooper::Create(SK_ColorBLUE,
-                                 SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)),
-                                 SkIntToScalar(5), SkIntToScalar(10),
-                                 SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
-                                 SkBlurDrawLooper::kOverrideColor_BlurFlag);
-    SkAutoUnref aurL1(shadowLoopers[1]);
-    shadowLoopers[2] =
-        SkBlurDrawLooper::Create(SK_ColorBLACK,
-                                 SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
-                                 SkIntToScalar(5),
-                                 SkIntToScalar(10),
-                                 SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
-                                 SkBlurDrawLooper::kHighQuality_BlurFlag);
-    SkAutoUnref aurL2(shadowLoopers[2]);
-    shadowLoopers[3] =
-        SkBlurDrawLooper::Create(0x7FFF0000,
-                                 SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
-                                 SkIntToScalar(-5), SkIntToScalar(-10),
-                                 SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
-                                 SkBlurDrawLooper::kOverrideColor_BlurFlag |
-                                 SkBlurDrawLooper::kHighQuality_BlurFlag);
-    SkAutoUnref aurL3(shadowLoopers[3]);
-    shadowLoopers[4] =
-        SkBlurDrawLooper::Create(SK_ColorBLACK, SkIntToScalar(0),
-                                 SkIntToScalar(5), SkIntToScalar(5),
-                                 SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
-                                 SkBlurDrawLooper::kOverrideColor_BlurFlag |
-                                 SkBlurDrawLooper::kHighQuality_BlurFlag);
-    SkAutoUnref aurL4(shadowLoopers[4]);
-
-    static const struct {
-        SkColor fColor;
-        SkScalar fStrokeWidth;
-    } gRec[] = {
-        { SK_ColorRED,      -SK_Scalar1 },
-        { SK_ColorGREEN,    SkIntToScalar(4) },
-        { SK_ColorBLUE,     SkIntToScalar(0)},
-    };
-
-    SkPaint paint;
-    paint.setAntiAlias(true);
-    for (size_t i = 0; i < SK_ARRAY_COUNT(shadowLoopers); ++i) {
-        SkAutoCanvasRestore acr(canvas, true);
-
-        paint.setLooper(shadowLoopers[i]);
-
-        canvas->translate(SkIntToScalar((unsigned int)i*40), SkIntToScalar(0));
-        setup(&paint, gRec[0].fColor, gRec[0].fStrokeWidth);
-        canvas->drawRect(fRect, paint);
-
-        canvas->translate(SkIntToScalar(0), SkIntToScalar(40));
-        setup(&paint, gRec[1].fColor, gRec[1].fStrokeWidth);
-        canvas->drawPath(fCirclePath, paint);
-
-        canvas->translate(SkIntToScalar(0), SkIntToScalar(40));
-        setup(&paint, gRec[2].fColor, gRec[2].fStrokeWidth);
-        canvas->drawPath(fCirclePath, paint);
+    void onDraw(SkCanvas* canvas) override {
+        SkBlurDrawLooper* shadowLoopers[5];
+        shadowLoopers[0] =
+            SkBlurDrawLooper::Create(SK_ColorBLUE,
+                                     SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)),
+                                     SkIntToScalar(5), SkIntToScalar(10),
+                                     SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
+                                     SkBlurDrawLooper::kOverrideColor_BlurFlag |
+                                     SkBlurDrawLooper::kHighQuality_BlurFlag);
+        SkAutoUnref aurL0(shadowLoopers[0]);
+        shadowLoopers[1] =
+            SkBlurDrawLooper::Create(SK_ColorBLUE,
+                                     SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)),
+                                     SkIntToScalar(5), SkIntToScalar(10),
+                                     SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
+                                     SkBlurDrawLooper::kOverrideColor_BlurFlag);
+        SkAutoUnref aurL1(shadowLoopers[1]);
+        shadowLoopers[2] =
+            SkBlurDrawLooper::Create(SK_ColorBLACK,
+                                     SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
+                                     SkIntToScalar(5),
+                                     SkIntToScalar(10),
+                                     SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
+                                     SkBlurDrawLooper::kHighQuality_BlurFlag);
+        SkAutoUnref aurL2(shadowLoopers[2]);
+        shadowLoopers[3] =
+            SkBlurDrawLooper::Create(0x7FFF0000,
+                                     SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
+                                     SkIntToScalar(-5), SkIntToScalar(-10),
+                                     SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
+                                     SkBlurDrawLooper::kOverrideColor_BlurFlag |
+                                     SkBlurDrawLooper::kHighQuality_BlurFlag);
+        SkAutoUnref aurL3(shadowLoopers[3]);
+        shadowLoopers[4] =
+            SkBlurDrawLooper::Create(SK_ColorBLACK, SkIntToScalar(0),
+                                     SkIntToScalar(5), SkIntToScalar(5),
+                                     SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
+                                     SkBlurDrawLooper::kOverrideColor_BlurFlag |
+                                     SkBlurDrawLooper::kHighQuality_BlurFlag);
+        SkAutoUnref aurL4(shadowLoopers[4]);
+
+        static const struct {
+            SkColor fColor;
+            SkScalar fStrokeWidth;
+        } gRec[] = {
+            { SK_ColorRED,      -SK_Scalar1 },
+            { SK_ColorGREEN,    SkIntToScalar(4) },
+            { SK_ColorBLUE,     SkIntToScalar(0)},
+        };
+
+        SkPaint paint;
+        paint.setAntiAlias(true);
+        for (size_t i = 0; i < SK_ARRAY_COUNT(shadowLoopers); ++i) {
+            SkAutoCanvasRestore acr(canvas, true);
+
+            paint.setLooper(shadowLoopers[i]);
+
+            canvas->translate(SkIntToScalar((unsigned int)i*40), SkIntToScalar(0));
+            setup(&paint, gRec[0].fColor, gRec[0].fStrokeWidth);
+            canvas->drawRect(fRect, paint);
+
+            canvas->translate(SkIntToScalar(0), SkIntToScalar(40));
+            setup(&paint, gRec[1].fColor, gRec[1].fStrokeWidth);
+            canvas->drawPath(fCirclePath, paint);
+
+            canvas->translate(SkIntToScalar(0), SkIntToScalar(40));
+            setup(&paint, gRec[2].fColor, gRec[2].fStrokeWidth);
+            canvas->drawPath(fCirclePath, paint);
+        }
     }
-}
 
 private:
     typedef GM INHERITED;
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp
index c0aa515507..1745eb1af4 100644
--- a/gm/simpleaaclip.cpp
+++ b/gm/simpleaaclip.cpp
@@ -126,7 +126,7 @@ protected:
         canvas->restore();
     }
 
-    virtual SkString onShortName() {
+    SkString onShortName() override {
         SkString str;
         str.printf("simpleaaclip_%s",
                     kRect_GeomType == fGeomType ? "rect" :
@@ -135,11 +135,11 @@ protected:
         return str;
     }
 
-    virtual SkISize onISize() {
+    SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    void onDraw(SkCanvas* canvas) override {
 
         static const struct {
             SkColor         fColor;