Fix up -Winconsistent-missing-override

bench/BitmapBench.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 75 matching lines @@
 public:
     BitmapBench(SkColorType ct, SkAlphaType at, bool forceUpdate, bool isVolatile, bool doScale)
         : fColorType(ct)
         , fAlphaType(at)
         , fForceUpdate(forceUpdate)
         , fIsVolatile(isVolatile)
         , fDoScale(doScale)
     {}
 
 protected:
-    virtual const char* onGetName() {
+    const char* onGetName() override {
         fName.set("bitmap");
         fName.appendf("_%s%s", sk_tool_utils::colortype_name(fColorType),
                       kOpaque_SkAlphaType == fAlphaType ? "" : "_A");
         if (fDoScale) {
             fName.append("_scale");
         }
         if (fForceUpdate) {
             fName.append("_update");
         }
         if (fIsVolatile) {
             fName.append("_volatile");
         }
 
         return fName.c_str();
     }
 
-    virtual void onPreDraw() {
+    void onPreDraw() override {
         SkBitmap bm;
 
         if (kIndex_8_SkColorType == fColorType) {
             bm.allocPixels(SkImageInfo::MakeN32(W, H, fAlphaType));
         } else {
             bm.allocPixels(SkImageInfo::Make(W, H, fColorType, fAlphaType));
         }
         bm.eraseColor(kOpaque_SkAlphaType == fAlphaType ? SK_ColorBLACK : 0);
 
-        onDrawIntoBitmap(bm);
+        this->onDrawIntoBitmap(bm);
 
         if (kIndex_8_SkColorType == fColorType) {
             convertToIndex666(bm, &fBitmap, fAlphaType);
         } else {
             fBitmap = bm;
         }
 
         fBitmap.setIsVolatile(fIsVolatile);
     }
 
-    virtual void onDraw(const int loops, SkCanvas* canvas) {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         if (fDoScale) {
             canvas->scale(.99f, .99f);
         }
         SkIPoint dim = this->getSize();
         SkRandom rand;
 
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
 
         const SkBitmap& bitmap = fBitmap;
         const SkScalar x0 = SkIntToScalar(-bitmap.width() / 2);
         const SkScalar y0 = SkIntToScalar(-bitmap.height() / 2);
 
         for (int i = 0; i < loops; i++) {
             SkScalar x = x0 + rand.nextUScalar1() * dim.fX;
             SkScalar y = y0 + rand.nextUScalar1() * dim.fY;
 
             if (fForceUpdate)
                 bitmap.notifyPixelsChanged();
 
             canvas->drawBitmap(bitmap, x, y, &paint);
         }
     }
 
-    virtual void onDrawIntoBitmap(const SkBitmap& bm) {
+     virtual void onDrawIntoBitmap(const SkBitmap& bm) {
         const int w = bm.width();
         const int h = bm.height();
 
         SkCanvas canvas(bm);
         SkPaint p;
         p.setAntiAlias(true);
         p.setColor(SK_ColorRED);
         canvas.drawCircle(SkIntToScalar(w)/2, SkIntToScalar(h)/2,
                           SkIntToScalar(SkMin32(w, h))*3/8, p);
 
@@ skipping 31 matching lines @@
     uint32_t    fFlags;
     SkString    fFullName;
 public:
     FilterBitmapBench(SkColorType ct, SkAlphaType at,
                       bool forceUpdate, bool isVolitile, uint32_t flags)
         : INHERITED(ct, at, forceUpdate, isVolitile, false)
         , fFlags(flags) {
     }
 
 protected:
-    virtual const char* onGetName() {
+    const char* onGetName() override {
         fFullName.set(INHERITED::onGetName());
         if (fFlags & kScale_Flag) {
             fFullName.append("_scale");
         }
         if (fFlags & kRotate_Flag) {
             fFullName.append("_rotate");
         }
         if (isBilerp(fFlags)) {
             fFullName.append("_bilerp");
         } else if (isBicubic(fFlags)) {
             fFullName.append("_bicubic");
         }
 
         return fFullName.c_str();
     }
 
-    virtual void onDraw(const int loops, SkCanvas* canvas) {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         SkISize dim = canvas->getDeviceSize();
         if (fFlags & kScale_Flag) {
             const SkScalar x = SkIntToScalar(dim.fWidth) / 2;
             const SkScalar y = SkIntToScalar(dim.fHeight) / 2;
 
             canvas->translate(x, y);
             // just enough so we can't take the sprite case
             canvas->scale(SK_Scalar1 * 99/100, SK_Scalar1 * 99/100);
             canvas->translate(-x, -y);
         }
@@ skipping 41 matching lines @@
     SkString    fFullName;
     SourceAlpha fSourceAlpha;
 public:
     SourceAlphaBitmapBench(SourceAlpha alpha, SkColorType ct,
                 bool forceUpdate = false, bool bitmapVolatile = false)
         : INHERITED(ct, kPremul_SkAlphaType, forceUpdate, bitmapVolatile, false)
         , fSourceAlpha(alpha) {
     }
 
 protected:
-    virtual const char* onGetName() {
+    const char* onGetName() override {
         fFullName.set(INHERITED::onGetName());
 
         if (fSourceAlpha == kOpaque_SourceAlpha) {
                 fFullName.append("_source_opaque");
         } else if (fSourceAlpha == kTransparent_SourceAlpha) {
                 fFullName.append("_source_transparent");
         } else if (fSourceAlpha == kTwoStripes_SourceAlpha) {
                 fFullName.append("_source_stripes_two");
         } else if (fSourceAlpha == kThreeStripes_SourceAlpha) {
                 fFullName.append("_source_stripes_three");
@@ skipping 80 matching lines @@
 DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kOpaque_SkAlphaType, true, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
 
 DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kBilerp_Flag | kBicubic_Flag); )
 DEF_BENCH( return new FilterBitmapBench(kN32_SkColorType, kPremul_SkAlphaType, false, false, kScale_Flag | kRotate_Flag | kBilerp_Flag | kBicubic_Flag); )
 
 // source alpha tests -> S32A_Opaque_BlitRow32_{arm,neon}
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kOpaque_SourceAlpha, kN32_SkColorType); )
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTransparent_SourceAlpha, kN32_SkColorType); )
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTwoStripes_SourceAlpha, kN32_SkColorType); )
 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kThreeStripes_SourceAlpha, kN32_SkColorType); )