Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: bench/BitmapBench.cpp

Issue 1232463006: Fix up -Winconsistent-missing-override (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: llvm_coverage_build Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/AlternatingColorPatternBench.cpp ('k') | bench/BitmapScaleBench.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/BitmapBench.cpp
diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index 6220247c8d2ea1e4ab5f956802f549c7126a323d..718f7ac86fe96b6866d9473897823d943ef03792 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -93,7 +93,7 @@ public:
{}
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");
@@ -110,7 +110,7 @@ protected:
return fName.c_str();
}
- virtual void onPreDraw() {
+ void onPreDraw() override {
SkBitmap bm;
if (kIndex_8_SkColorType == fColorType) {
@@ -120,7 +120,7 @@ protected:
}
bm.eraseColor(kOpaque_SkAlphaType == fAlphaType ? SK_ColorBLACK : 0);
- onDrawIntoBitmap(bm);
+ this->onDrawIntoBitmap(bm);
if (kIndex_8_SkColorType == fColorType) {
convertToIndex666(bm, &fBitmap, fAlphaType);
@@ -131,7 +131,7 @@ protected:
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);
}
@@ -156,7 +156,7 @@ protected:
}
}
- virtual void onDrawIntoBitmap(const SkBitmap& bm) {
+ virtual void onDrawIntoBitmap(const SkBitmap& bm) {
const int w = bm.width();
const int h = bm.height();
@@ -208,7 +208,7 @@ public:
}
protected:
- virtual const char* onGetName() {
+ const char* onGetName() override {
fFullName.set(INHERITED::onGetName());
if (fFlags & kScale_Flag) {
fFullName.append("_scale");
@@ -225,7 +225,7 @@ protected:
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;
@@ -287,7 +287,7 @@ public:
}
protected:
- virtual const char* onGetName() {
+ const char* onGetName() override {
fFullName.set(INHERITED::onGetName());
if (fSourceAlpha == kOpaque_SourceAlpha) {
« no previous file with comments | « bench/AlternatingColorPatternBench.cpp ('k') | bench/BitmapScaleBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698