Fix clang 12 Wsuggest-override and Wsuggest-destructor-override
Change-Id: Ic44e24057b95bb014504f02a736fb4341afc8971
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304856
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp
index 57af3be..d0e224f 100644
--- a/bench/AAClipBench.cpp
+++ b/bench/AAClipBench.cpp
@@ -41,8 +41,8 @@
}
protected:
- virtual const char* onGetName() { return fName.c_str(); }
- virtual void onDraw(int loops, SkCanvas* canvas) {
+ const char* onGetName() override { return fName.c_str(); }
+ void onDraw(int loops, SkCanvas* canvas) override {
SkPaint paint;
this->setupPaint(&paint);
@@ -111,7 +111,7 @@
}
protected:
- virtual const char* onGetName() { return fName.c_str(); }
+ const char* onGetName() override { return fName.c_str(); }
void recurse(SkCanvas* canvas,
@@ -156,7 +156,7 @@
canvas->restore();
}
- virtual void onDraw(int loops, SkCanvas* canvas) {
+ void onDraw(int loops, SkCanvas* canvas) override {
for (int i = 0; i < loops; ++i) {
SkPoint offset = SkPoint::Make(0, 0);
@@ -192,8 +192,8 @@
}
protected:
- virtual const char* onGetName() { return fName.c_str(); }
- virtual void onDraw(int loops, SkCanvas*) {
+ const char* onGetName() override { return fName.c_str(); }
+ void onDraw(int loops, SkCanvas*) override {
SkPaint paint;
this->setupPaint(&paint);
@@ -227,8 +227,8 @@
}
protected:
- virtual const char* onGetName() { return "aaclip_setregion"; }
- virtual void onDraw(int loops, SkCanvas*) {
+ const char* onGetName() override { return "aaclip_setregion"; }
+ void onDraw(int loops, SkCanvas*) override {
for (int i = 0; i < loops; ++i) {
SkAAClip clip;
clip.setRegion(fRegion);
diff --git a/bench/BezierBench.cpp b/bench/BezierBench.cpp
index 395cdde..64cc1fe 100644
--- a/bench/BezierBench.cpp
+++ b/bench/BezierBench.cpp
@@ -75,11 +75,11 @@
}
protected:
- virtual const char* onGetName() {
+ const char* onGetName() override {
return fName.c_str();
}
- virtual void onDraw(int loops, SkCanvas* canvas) {
+ void onDraw(int loops, SkCanvas* canvas) override {
fRec.fCanvas = canvas;
this->setupPaint(&fRec.fPaint);
fRec.fPaint.setStyle(SkPaint::kStroke_Style);
diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp
index 2fe92bd..807e426 100644
--- a/bench/BlurRectBench.cpp
+++ b/bench/BlurRectBench.cpp
@@ -39,7 +39,7 @@
}
protected:
- virtual const char* onGetName() {
+ const char* onGetName() override {
return fName.c_str();
}
@@ -51,7 +51,7 @@
fName = name;
}
- virtual void onDraw(int loops, SkCanvas*) {
+ void onDraw(int loops, SkCanvas*) override {
SkPaint paint;
this->setupPaint(&paint);
diff --git a/bench/ChromeBench.cpp b/bench/ChromeBench.cpp
index a4f56e9..56ba15f 100644
--- a/bench/ChromeBench.cpp
+++ b/bench/ChromeBench.cpp
@@ -460,8 +460,8 @@
protected:
- virtual const char* onGetName() { return "chrome_scrollGmail"; }
- virtual void onDraw(int loops, SkCanvas* canvas) {
+ const char* onGetName() override { return "chrome_scrollGmail"; }
+ void onDraw(int loops, SkCanvas* canvas) override {
SkDEBUGCODE(this->validateBounds(canvas));
SkPaint paint;
this->setupPaint(&paint);
@@ -473,7 +473,7 @@
}
}
}
- virtual SkIPoint onGetSize() { return SkIPoint::Make(W, H); }
+ SkIPoint onGetSize() override { return SkIPoint::Make(W, H); }
void setRectangle(SkRect& current, int i) {
current.setWH(SkIntToScalar(gmailScrollingRectSpec[i*3+1]),
diff --git a/bench/GeometryBench.cpp b/bench/GeometryBench.cpp
index abaf678..7de4717 100644
--- a/bench/GeometryBench.cpp
+++ b/bench/GeometryBench.cpp
@@ -46,7 +46,7 @@
protected:
SkRect fRects[2048];
- virtual void onDelayedSetup() {
+ void onDelayedSetup() override {
const SkScalar min = -100;
const SkScalar max = 100;
SkRandom rand;
diff --git a/bench/GradientBench.cpp b/bench/GradientBench.cpp
index e202350..eebd55c 100644
--- a/bench/GradientBench.cpp
+++ b/bench/GradientBench.cpp
@@ -319,11 +319,11 @@
}
protected:
- virtual const char* onGetName() {
+ const char* onGetName() override {
return fName.c_str();
}
- virtual void onDraw(int loops, SkCanvas* canvas) {
+ void onDraw(int loops, SkCanvas* canvas) override {
SkPaint paint;
this->setupPaint(&paint);
diff --git a/bench/SKPAnimationBench.cpp b/bench/SKPAnimationBench.cpp
index 2bd3efb..72cdef3 100644
--- a/bench/SKPAnimationBench.cpp
+++ b/bench/SKPAnimationBench.cpp
@@ -46,10 +46,10 @@
, fZoomPeriodMs(zoomPeriodMs) {
}
- virtual const char* getTag() { return "zoom"; }
+ const char* getTag() override { return "zoom"; }
- virtual void preConcatFrameMatrix(double animationTimeMs, const SkIRect& devBounds,
- SkMatrix* drawMatrix) {
+ void preConcatFrameMatrix(double animationTimeMs, const SkIRect& devBounds,
+ SkMatrix* drawMatrix) override {
double t = fmod(animationTimeMs / fZoomPeriodMs, 1.0); // t is in [0, 1).
t = fabs(2 * t - 1); // Make t ping-pong between 0 and 1
SkScalar zoom = static_cast<SkScalar>(pow(fZoomMax, t));
diff --git a/bench/SKPAnimationBench.h b/bench/SKPAnimationBench.h
index 153f1fd..573af1d 100644
--- a/bench/SKPAnimationBench.h
+++ b/bench/SKPAnimationBench.h
@@ -23,7 +23,6 @@
virtual const char* getTag() = 0;
virtual void preConcatFrameMatrix(double animationTimeMs, const SkIRect& devBounds,
SkMatrix* drawMatrix) = 0;
- virtual ~Animation() {}
};
SKPAnimationBench(const char* name, const SkPicture*, const SkIRect& devClip, sk_sp<Animation>,
diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp
index 714eecc..f22b344 100644
--- a/bench/ScalarBench.cpp
+++ b/bench/ScalarBench.cpp
@@ -56,8 +56,8 @@
init9(fArray);
}
protected:
- virtual int mulLoopCount() const { return 4; }
- virtual void performTest() {
+ int mulLoopCount() const override { return 4; }
+ void performTest() override {
// xoring into a volatile prevents the compiler from optimizing these checks away.
volatile bool junk = false;
junk ^= (fArray[6] != 0.0f || fArray[7] != 0.0f || fArray[8] != 1.0f);
@@ -75,8 +75,8 @@
init9(fArray);
}
protected:
- virtual int mulLoopCount() const { return 4; }
- virtual void performTest() {
+ int mulLoopCount() const override { return 4; }
+ void performTest() override {
// xoring into a volatile prevents the compiler from optimizing these checks away.
volatile int32_t junk = 0;
junk ^= (SkScalarAs2sCompliment(fArray[6]) |
diff --git a/bench/TableBench.cpp b/bench/TableBench.cpp
index 33654c0..c1e1b95 100644
--- a/bench/TableBench.cpp
+++ b/bench/TableBench.cpp
@@ -29,11 +29,11 @@
static const int kNumCols = 32;
protected:
- virtual const char* onGetName() {
+ const char* onGetName() override {
return "tablebench";
}
- virtual void onDraw(int loops, SkCanvas* canvas) {
+ void onDraw(int loops, SkCanvas* canvas) override {
SkPaint cellPaint;
cellPaint.setColor(0xFFFFFFF);
diff --git a/bench/TileBench.cpp b/bench/TileBench.cpp
index 0a944dd..9a53773 100644
--- a/bench/TileBench.cpp
+++ b/bench/TileBench.cpp
@@ -73,11 +73,11 @@
}
protected:
- virtual const char* onGetName() {
+ const char* onGetName() override {
return fName.c_str();
}
- virtual void onDraw(int loops, SkCanvas* canvas) {
+ void onDraw(int loops, SkCanvas* canvas) override {
SkPaint paint(fPaint);
this->setupPaint(&paint);
paint.setFilterQuality(fDoFilter ? kLow_SkFilterQuality