Index: bench/MatrixBench.cpp |
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp |
index e3e5c703e8d9d4f391af3aabf24aab1cb68986b8..75736aa1432bb29ff166a93aeb185dad768f6478 100644 |
--- a/bench/MatrixBench.cpp |
+++ b/bench/MatrixBench.cpp |
@@ -27,11 +27,11 @@ public: |
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(); |
} |
@@ -46,7 +46,7 @@ class EqualsMatrixBench : public MatrixBench { |
public: |
EqualsMatrixBench() : INHERITED("equals") {} |
protected: |
- virtual void performTest() { |
+ void performTest() override { |
SkMatrix m0, m1, m2; |
m0.reset(); |
@@ -72,7 +72,7 @@ public: |
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); |
@@ -112,7 +112,7 @@ 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]); |
@@ -146,7 +146,7 @@ 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); |
@@ -157,7 +157,7 @@ protected: |
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); |
@@ -201,7 +201,7 @@ public: |
kUncachedTypeMask_Flag = 0x10, |
}; |
protected: |
- virtual void performTest() { |
+ void performTest() override { |
if (fFlags & kUncachedTypeMask_Flag) { |
// This will invalidate the typemask without |
// changing the matrix. |