Fix up -Winconsistent-missing-override

bench/MatrixBench.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 "SkMatrix.h"
 #include "SkMatrixUtils.h"
 #include "SkRandom.h"
 #include "SkString.h"
 
 class MatrixBench : public Benchmark {
     SkString    fName;
 public:
     MatrixBench(const char name[])  {
         fName.printf("matrix_%s", name);
     }
 
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
 
     virtual void performTest() = 0;
 
 protected:
     virtual int mulLoopCount() const { return 1; }
 
-    virtual const char* onGetName() {
+    const char* onGetName() override {
         return fName.c_str();
     }
 
-    virtual void onDraw(const int loops, SkCanvas*) {
+    void onDraw(const int loops, SkCanvas*) override {
         for (int i = 0; i < loops; i++) {
             this->performTest();
         }
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 
 class EqualsMatrixBench : public MatrixBench {
 public:
     EqualsMatrixBench() : INHERITED("equals") {}
 protected:
-    virtual void performTest() {
+    void performTest() override {
         SkMatrix m0, m1, m2;
 
         m0.reset();
         m1.reset();
         m2.reset();
 
         // xor into a volatile prevents these comparisons from being optimized away.
         volatile bool junk = false;
         junk ^= (m0 == m1);
         junk ^= (m1 == m2);
         junk ^= (m2 == m0);
     }
 private:
     typedef MatrixBench INHERITED;
 };
 
 class ScaleMatrixBench : public MatrixBench {
 public:
     ScaleMatrixBench() : INHERITED("scale") {
         fSX = fSY = 1.5f;
         fM0.reset();
         fM1.setScale(fSX, fSY);
         fM2.setTranslate(fSX, fSY);
     }
 protected:
-    virtual void performTest() {
+    void performTest() override {
         SkMatrix m;
         m = fM0; m.preScale(fSX, fSY);
         m = fM1; m.preScale(fSX, fSY);
         m = fM2; m.preScale(fSX, fSY);
     }
 private:
     SkMatrix fM0, fM1, fM2;
     SkScalar fSX, fSY;
     typedef MatrixBench INHERITED;
 };
@@ skipping 19 matching lines @@
         fArray[4] = (float) fRnd.nextS();
         fArray[5] = (float) fRnd.nextS();
         fArray[6] = (float) fRnd.nextS();
         fArray[7] = (float) fRnd.nextS();
         fArray[8] = (float) fRnd.nextS();
     }
 protected:
     // Putting random generation of the matrix inside performTest()
     // would help us avoid anomalous runs, but takes up 25% or
     // more of the function time.
-    virtual void performTest() {
+    void performTest() override {
         fMatrix.setAll(fArray[0], fArray[1], fArray[2],
                        fArray[3], fArray[4], fArray[5],
                        fArray[6], fArray[7], fArray[8]);
         // xoring into a volatile prevents the compiler from optimizing these away
         volatile int junk = 0;
         junk ^= (fMatrix.getType());
         fMatrix.dirtyMatrixTypeCache();
         junk ^= (fMatrix.getType());
         fMatrix.dirtyMatrixTypeCache();
         junk ^= (fMatrix.getType());
@@ skipping 13 matching lines @@
     float fArray[9];
     SkRandom fRnd;
     typedef MatrixBench INHERITED;
 };
 
 class DecomposeMatrixBench : public MatrixBench {
 public:
     DecomposeMatrixBench() : INHERITED("decompose") {}
 
 protected:
-    virtual void onPreDraw() {
+    void onPreDraw() override {
         for (int i = 0; i < 10; ++i) {
             SkScalar rot0 = (fRandom.nextBool()) ? fRandom.nextRangeF(-180, 180) : 0.0f;
             SkScalar sx = fRandom.nextRangeF(-3000.f, 3000.f);
             SkScalar sy = (fRandom.nextBool()) ? fRandom.nextRangeF(-3000.f, 3000.f) : sx;
             SkScalar rot1 = fRandom.nextRangeF(-180, 180);
             fMatrix[i].setRotate(rot0);
             fMatrix[i].postScale(sx, sy);
             fMatrix[i].postRotate(rot1);
         }
     }
-    virtual void performTest() {
+    void performTest() override {
         SkPoint rotation1, scale, rotation2;
         for (int i = 0; i < 10; ++i) {
             (void) SkDecomposeUpper2x2(fMatrix[i], &rotation1, &scale, &rotation2);
         }
     }
 private:
     SkMatrix fMatrix[10];
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
@@ skipping 23 matching lines @@
         }
     }
     enum Flag {
         kScale_Flag             = 0x01,
         kTranslate_Flag         = 0x02,
         kRotate_Flag            = 0x04,
         kPerspective_Flag       = 0x08,
         kUncachedTypeMask_Flag  = 0x10,
     };
 protected:
-    virtual void performTest() {
+    void performTest() override {
         if (fFlags & kUncachedTypeMask_Flag) {
             // This will invalidate the typemask without
             // changing the matrix.
             fMatrix.setPerspX(fMatrix.getPerspX());
         }
         SkMatrix inv;
         bool invertible = fMatrix.invert(&inv);
         SkASSERT(invertible);
         SkRect transformedRect;
         // an arbitrary, small, non-zero rect to transform
@@ skipping 77 matching lines @@
         for (int i = 0; i < 1000000; ++i) {
             fM.mapPoints(fDst, fSrc, N);
         }
     }
 };
 DEF_BENCH( return new MapPointsMatrixBench("mappoints_identity", SkMatrix::I()); )
 DEF_BENCH( return new MapPointsMatrixBench("mappoints_trans", make_trans()); )
 DEF_BENCH( return new MapPointsMatrixBench("mappoints_scale", make_scale()); )
 DEF_BENCH( return new MapPointsMatrixBench("mappoints_affine", make_afine()); )