diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /bench | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) | |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'bench')
74 files changed, 385 insertions, 385 deletions
diff --git a/bench/AlternatingColorPatternBench.cpp b/bench/AlternatingColorPatternBench.cpp index 3d812aa65a..7744d72e5f 100644 --- a/bench/AlternatingColorPatternBench.cpp +++ b/bench/AlternatingColorPatternBench.cpp @@ -108,7 +108,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } @@ -146,7 +146,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; paint.setAntiAlias(false); paint.setFilterQuality(kLow_SkFilterQuality); diff --git a/bench/BigPathBench.cpp b/bench/BigPathBench.cpp index c46296e159..f18e3de077 100644 --- a/bench/BigPathBench.cpp +++ b/bench/BigPathBench.cpp @@ -38,19 +38,19 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - SkIPoint onGetSize() SK_OVERRIDE { + SkIPoint onGetSize() override { return SkIPoint::Make(640, 100); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { make_path(fPath); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; paint.setAntiAlias(true); paint.setStyle(SkPaint::kStroke_Style); diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp index 1ac1992ab6..6220247c8d 100644 --- a/bench/BitmapBench.cpp +++ b/bench/BitmapBench.cpp @@ -247,7 +247,7 @@ protected: INHERITED::onDraw(loops, canvas); } - void setupPaint(SkPaint* paint) SK_OVERRIDE { + void setupPaint(SkPaint* paint) override { this->INHERITED::setupPaint(paint); int index = 0; @@ -303,7 +303,7 @@ protected: return fFullName.c_str(); } - void onDrawIntoBitmap(const SkBitmap& bm) SK_OVERRIDE { + void onDrawIntoBitmap(const SkBitmap& bm) override { const int w = bm.width(); const int h = bm.height(); diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp index e2c2e345fc..d3a7574e04 100644 --- a/bench/BitmapRectBench.cpp +++ b/bench/BitmapRectBench.cpp @@ -59,7 +59,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { fName.printf("bitmaprect_%02X_%sfilter_%s", fAlpha, kNone_SkFilterQuality == fFilterQuality ? "no" : "", @@ -67,7 +67,7 @@ protected: return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fBitmap.allocPixels(); fBitmap.setAlphaType(kOpaque_SkAlphaType); fBitmap.eraseColor(SK_ColorBLACK); @@ -87,7 +87,7 @@ protected: } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom rand; SkPaint paint; diff --git a/bench/BitmapScaleBench.cpp b/bench/BitmapScaleBench.cpp index 5bd5b522d9..f71e10ff6a 100644 --- a/bench/BitmapScaleBench.cpp +++ b/bench/BitmapScaleBench.cpp @@ -48,7 +48,7 @@ protected: return float(outputSize())/inputSize(); } - SkIPoint onGetSize() SK_OVERRIDE { + SkIPoint onGetSize() override { return SkIPoint::Make( fOutputSize, fOutputSize ); } @@ -88,7 +88,7 @@ class BitmapFilterScaleBench: public BitmapScaleBench { setName( "filter" ); } protected: - void doScaleImage() SK_OVERRIDE { + void doScaleImage() override { SkCanvas canvas( fOutputBitmap ); SkPaint paint; diff --git a/bench/BlurImageFilterBench.cpp b/bench/BlurImageFilterBench.cpp index 68d0e6c574..476f192ef8 100644 --- a/bench/BlurImageFilterBench.cpp +++ b/bench/BlurImageFilterBench.cpp @@ -31,18 +31,18 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInitialized) { make_checkerboard(); fInitialized = true; } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; paint.setImageFilter(SkBlurImageFilter::Create(fSigmaX, fSigmaY))->unref(); diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp index 66aff22073..8f8a2de25b 100644 --- a/bench/BlurRectBench.cpp +++ b/bench/BlurRectBench.cpp @@ -88,7 +88,7 @@ class BlurRectDirectBench: public BlurRectBench { this->setName(name); } protected: - void makeBlurryRect(const SkRect& r) SK_OVERRIDE { + void makeBlurryRect(const SkRect& r) override { SkMask mask; SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), &mask, r, kNormal_SkBlurStyle); @@ -110,7 +110,7 @@ public: } protected: - void preBenchSetup(const SkRect& r) SK_OVERRIDE { + void preBenchSetup(const SkRect& r) override { SkMask::FreeImage(fSrcMask.fImage); r.roundOut(&fSrcMask.fBounds); @@ -142,7 +142,7 @@ public: protected: - void makeBlurryRect(const SkRect&) SK_OVERRIDE { + void makeBlurryRect(const SkRect&) override { SkMask mask; mask.fImage = NULL; SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()), @@ -169,7 +169,7 @@ public: protected: - void makeBlurryRect(const SkRect&) SK_OVERRIDE { + void makeBlurryRect(const SkRect&) override { SkMask mask; mask.fImage = NULL; SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()), diff --git a/bench/BlurRectsBench.cpp b/bench/BlurRectsBench.cpp index 553cf6b398..83847713ee 100644 --- a/bench/BlurRectsBench.cpp +++ b/bench/BlurRectsBench.cpp @@ -21,7 +21,7 @@ public: fInner = inner; } - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } @@ -29,7 +29,7 @@ public: fName = name; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; paint.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, fRadius))->unref(); diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp index 7ec89b8690..9f1e143862 100644 --- a/bench/BlurRoundRectBench.cpp +++ b/bench/BlurRoundRectBench.cpp @@ -30,16 +30,16 @@ public: fRRect.setRectXY(r, SkIntToScalar(cornerRadius), SkIntToScalar(cornerRadius)); } - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - SkIPoint onGetSize() SK_OVERRIDE { + SkIPoint onGetSize() override { return SkIPoint::Make(SkScalarCeilToInt(fRRect.rect().width()), SkScalarCeilToInt(fRRect.rect().height())); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkLayerDrawLooper::Builder looperBuilder; { SkLayerDrawLooper::LayerInfo info; diff --git a/bench/ChartBench.cpp b/bench/ChartBench.cpp index 175e1ddfd3..0cc02b0a86 100644 --- a/bench/ChartBench.cpp +++ b/bench/ChartBench.cpp @@ -94,7 +94,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { if (fAA) { return "chart_aa"; } else { @@ -102,7 +102,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { bool sizeChanged = false; if (canvas->getDeviceSize() != fSize) { fSize = canvas->getDeviceSize(); diff --git a/bench/ChecksumBench.cpp b/bench/ChecksumBench.cpp index 661f9e676c..9dd87c3481 100644 --- a/bench/ChecksumBench.cpp +++ b/bench/ChecksumBench.cpp @@ -35,7 +35,7 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } diff --git a/bench/CmapBench.cpp b/bench/CmapBench.cpp index ca0b25d282..10591ed410 100644 --- a/bench/CmapBench.cpp +++ b/bench/CmapBench.cpp @@ -81,11 +81,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { fProc(loops, fPaint, fText, sizeof(fText), NGLYPHS); } diff --git a/bench/ColorCubeBench.cpp b/bench/ColorCubeBench.cpp index 0d1e589d59..9326a123c3 100644 --- a/bench/ColorCubeBench.cpp +++ b/bench/ColorCubeBench.cpp @@ -27,22 +27,22 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "colorcube"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!SkToBool(fCubeData)) { this->makeCubeData(); this->make_bitmap(); } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { this->test(loops, canvas); } - SkIPoint onGetSize() SK_OVERRIDE { + SkIPoint onGetSize() override { return SkIPoint::Make(fSize.width(), fSize.height()); } diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp index b8cfbc3a80..04803b57b3 100644 --- a/bench/ColorFilterBench.cpp +++ b/bench/ColorFilterBench.cpp @@ -68,11 +68,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_dim_bright_small" : "colorfilter_dim_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -98,11 +98,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_bright_gray_small" : "colorfilter_bright_gray_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -125,11 +125,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_gray_bright_small" : "colorfilter_gray_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -152,11 +152,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_blue_bright_small" : "colorfilter_blue_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -179,11 +179,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_bright_blue_small" : "colorfilter_bright_blue_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -206,11 +206,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_bright_small" : "colorfilter_bright_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -232,11 +232,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_blue_small" : "colorfilter_blue_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -258,11 +258,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "colorfilter_gray_small" : "colorfilter_gray_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -284,11 +284,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "table_colorfilter_small" : "table_colorfilter_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -322,11 +322,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "luma_colorfilter_small" : "luma_colorfilter_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); diff --git a/bench/ColorPrivBench.cpp b/bench/ColorPrivBench.cpp index 4d04e89708..e6c68b5909 100644 --- a/bench/ColorPrivBench.cpp +++ b/bench/ColorPrivBench.cpp @@ -12,13 +12,13 @@ public: fName.append(kScale ? "_255" : "_256"); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } - const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { // A handful of random srcs and dsts. SkRandom rand; for (int i = 0; i < kInputs; i++) { @@ -33,7 +33,7 @@ public: if (kScale) fScales[256] = 255; // We'll just do 255 twice if we're limited to [0,255]. } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { // We xor results of FourByteInterp into junk to make sure the function runs. volatile SkPMColor junk = 0; diff --git a/bench/CoverageBench.cpp b/bench/CoverageBench.cpp index 097a9e1b28..96eafaaace 100644 --- a/bench/CoverageBench.cpp +++ b/bench/CoverageBench.cpp @@ -44,11 +44,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { if (fDrawCoverage) { for (int i = 0; i < loops; ++i) { fDraw.drawPathCoverage(fPath, fPaint); diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp index 5f209698de..17a9234926 100644 --- a/bench/DashBench.cpp +++ b/bench/DashBench.cpp @@ -57,11 +57,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; this->setupPaint(&paint); paint.setStyle(SkPaint::kStroke_Style); @@ -106,7 +106,7 @@ public: protected: virtual void handlePath(SkCanvas* canvas, const SkPath& path, - const SkPaint& paint, int N) SK_OVERRIDE { + const SkPaint& paint, int N) override { SkPoint pts[2]; if (!path.isLine(pts) || pts[0].fY != pts[1].fY) { this->INHERITED::handlePath(canvas, path, paint, N); @@ -190,11 +190,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { SkPath dst; for (int i = 0; i < loops; ++i) { SkStrokeRec rec(SkStrokeRec::kHairline_InitStyle); @@ -228,11 +228,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; this->setupPaint(&paint); paint.setStrokeWidth(fStrokeWidth); @@ -267,11 +267,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); @@ -353,11 +353,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint p; this->setupPaint(&p); p.setStyle(SkPaint::kStroke_Style); @@ -393,11 +393,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); diff --git a/bench/DecodingBench.h b/bench/DecodingBench.h index b41941b84f..80a474df32 100644 --- a/bench/DecodingBench.h +++ b/bench/DecodingBench.h @@ -22,9 +22,9 @@ public: DecodingBench(SkString path, SkColorType colorType); protected: - const char* onGetName() SK_OVERRIDE; - bool isSuitableFor(Backend backend) SK_OVERRIDE; - void onDraw(const int n, SkCanvas* canvas) SK_OVERRIDE; + const char* onGetName() override; + bool isSuitableFor(Backend backend) override; + void onDraw(const int n, SkCanvas* canvas) override; private: SkString fName; diff --git a/bench/DecodingSubsetBench.h b/bench/DecodingSubsetBench.h index 8034c8fb74..4941aa10c1 100644 --- a/bench/DecodingSubsetBench.h +++ b/bench/DecodingSubsetBench.h @@ -23,9 +23,9 @@ public: const int divisor); protected: - const char* onGetName() SK_OVERRIDE; - bool isSuitableFor(Backend backend) SK_OVERRIDE; - void onDraw(const int n, SkCanvas* canvas) SK_OVERRIDE; + const char* onGetName() override; + bool isSuitableFor(Backend backend) override; + void onDraw(const int n, SkCanvas* canvas) override; private: SkString fName; diff --git a/bench/DeferredSurfaceCopyBench.cpp b/bench/DeferredSurfaceCopyBench.cpp index e0bf8e7a78..3644627d31 100644 --- a/bench/DeferredSurfaceCopyBench.cpp +++ b/bench/DeferredSurfaceCopyBench.cpp @@ -26,12 +26,12 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fDiscardableContents ? "DeferredSurfaceCopy_discardable" : "DeferredSurfaceCopy_nonDiscardable"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { // The canvas is not actually used for this test except to provide // configuration information: gpu, multisampling, size, etc? SkImageInfo info = SkImageInfo::MakeN32Premul(kSurfaceWidth, kSurfaceHeight); diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp index 2f9a69e0f8..b9070cb9e0 100644 --- a/bench/DisplacementBench.cpp +++ b/bench/DisplacementBench.cpp @@ -22,7 +22,7 @@ public: } protected: - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInitialized) { this->makeBitmap(); this->makeCheckerboard(); @@ -91,11 +91,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return this->isSmall() ? "displacement_zero_small" : "displacement_zero_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard)); // No displacement effect @@ -118,11 +118,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "displacement_alpha_small" : "displacement_alpha_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard)); // Displacement, with 1 alpha component (which isn't pre-multiplied) @@ -144,11 +144,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return isSmall() ? "displacement_full_small" : "displacement_full_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard)); // Displacement, with 2 non-alpha components diff --git a/bench/ETCBitmapBench.cpp b/bench/ETCBitmapBench.cpp index 351b0ea09f..1cc61e6157 100644 --- a/bench/ETCBitmapBench.cpp +++ b/bench/ETCBitmapBench.cpp @@ -122,12 +122,12 @@ public: ETCBitmapBench(bool decompress, Backend backend) : fDecompress(decompress), fBackend(backend) { } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == this->fBackend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { if (kGPU_Backend == this->fBackend) { if (this->fDecompress) { return "etc1bitmap_render_gpu_decompressed"; @@ -144,7 +144,7 @@ protected: } } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (NULL == fPKMData) { SkDebugf("Failed to load PKM data!\n"); return; @@ -162,7 +162,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; ++i) { canvas->drawBitmap(this->fBitmap, 0, 0, NULL); } @@ -187,7 +187,7 @@ public: : ETCBitmapBench(decompress, backend) { } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { if (kGPU_Backend == this->backend()) { if (this->decompress()) { return "etc1bitmap_upload_gpu_decompressed"; @@ -204,7 +204,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPixelRef* pr = fBitmap.pixelRef(); for (int i = 0; i < loops; ++i) { if (pr) { diff --git a/bench/FSRectBench.cpp b/bench/FSRectBench.cpp index af99015a29..914b5b6688 100644 --- a/bench/FSRectBench.cpp +++ b/bench/FSRectBench.cpp @@ -20,9 +20,9 @@ public: FSRectBench() : fInit(false) { } protected: - const char* onGetName() SK_OVERRIDE { return "fullscreen_rects"; } + const char* onGetName() override { return "fullscreen_rects"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInit) { SkRandom rand; static const SkScalar kMinOffset = 0; @@ -39,7 +39,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; for (int i = 0; i < loops; ++i) { paint.setColor(fColors[i % N]); diff --git a/bench/FontCacheBench.cpp b/bench/FontCacheBench.cpp index 3bff0637d4..304d8d3c88 100644 --- a/bench/FontCacheBench.cpp +++ b/bench/FontCacheBench.cpp @@ -28,11 +28,11 @@ public: FontCacheBench() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "fontcache"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; this->setupPaint(&paint); paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); @@ -104,11 +104,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "fontefficiency"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { static bool gDone; if (gDone) { return; diff --git a/bench/GMBench.h b/bench/GMBench.h index 43ca9812a1..82ca3c9c71 100644 --- a/bench/GMBench.h +++ b/bench/GMBench.h @@ -21,10 +21,10 @@ public: virtual ~GMBench(); protected: - const char* onGetName() SK_OVERRIDE; - bool isSuitableFor(Backend backend) SK_OVERRIDE; - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE; - SkIPoint onGetSize() SK_OVERRIDE; + const char* onGetName() override; + bool isSuitableFor(Backend backend) override; + void onDraw(const int loops, SkCanvas* canvas) override; + SkIPoint onGetSize() override; private: skiagm::GM* fGM; diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index eb1d9b909a..d9a397e190 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -74,11 +74,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInitialized) { this->makeCheckerboard(); this->makeAtlas(); @@ -86,7 +86,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom scaleRand; SkRandom transRand; SkRandom rotRand; diff --git a/bench/GeometryBench.cpp b/bench/GeometryBench.cpp index 9178aa4b51..501c7b8262 100644 --- a/bench/GeometryBench.cpp +++ b/bench/GeometryBench.cpp @@ -16,11 +16,11 @@ public: fName.printf("geo_%s", suffix); } - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return kNonRendering_Backend == backend; } @@ -65,7 +65,7 @@ public: GeoRectBench_intersect() : GeoRectBench("rect_intersect") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int outer = 0; outer < loops; ++outer) { int count = 0; for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) { @@ -82,7 +82,7 @@ public: GeoRectBench_intersect_rect() : GeoRectBench("rect_intersect_rect") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int outer = 0; outer < loops; ++outer) { int count = 0; SkRect r; @@ -99,7 +99,7 @@ public: GeoRectBench_Intersects() : GeoRectBench("rect_Intersects") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int outer = 0; outer < loops; ++outer) { int count = 0; for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) { @@ -115,7 +115,7 @@ public: GeoRectBench_sort() : GeoRectBench("rect_sort") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int outer = 0; outer < loops; ++outer) { for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) { fRects[i].sort(); @@ -148,7 +148,7 @@ class EvalQuadAt0 : public QuadBenchBase { public: EvalQuadAt0() : QuadBenchBase("evalquadat0") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint result; for (int outer = 0; outer < loops; ++outer) { SkEvalQuadAt(fPts, 0.5f, &result); @@ -164,7 +164,7 @@ class EvalQuadAt1 : public QuadBenchBase { public: EvalQuadAt1() : QuadBenchBase("evalquadat1") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint result; for (int outer = 0; outer < loops; ++outer) { result = SkEvalQuadAt(fPts, 0.5f); @@ -182,7 +182,7 @@ class EvalQuadTangentAt0 : public QuadBenchBase { public: EvalQuadTangentAt0() : QuadBenchBase("evalquadtangentat0") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint result; for (int outer = 0; outer < loops; ++outer) { SkEvalQuadAt(fPts, 0.5f, NULL, &result); @@ -198,7 +198,7 @@ class EvalQuadTangentAt1 : public QuadBenchBase { public: EvalQuadTangentAt1() : QuadBenchBase("evalquadtangentat1") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint result; for (int outer = 0; outer < loops; ++outer) { result = SkEvalQuadTangentAt(fPts, 0.5f); @@ -216,7 +216,7 @@ class ChopQuadAt0 : public QuadBenchBase { public: ChopQuadAt0() : QuadBenchBase("chopquadat0") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint dst[5]; for (int outer = 0; outer < loops; ++outer) { SkChopQuadAt(fPts, dst, 0.5f); @@ -232,7 +232,7 @@ class ChopQuadAt1 : public QuadBenchBase { public: ChopQuadAt1() : QuadBenchBase("chopquadat1") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint dst[5]; for (int outer = 0; outer < loops; ++outer) { SkChopQuadAt2(fPts, dst, 0.5f); @@ -248,7 +248,7 @@ class ChopCubicAt0 : public QuadBenchBase { public: ChopCubicAt0() : QuadBenchBase("chopcubicat0") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint dst[7]; for (int outer = 0; outer < loops; ++outer) { SkChopCubicAt(fPts, dst, 0.5f); @@ -264,7 +264,7 @@ class ChopCubicAt1 : public QuadBenchBase { public: ChopCubicAt1() : QuadBenchBase("chopcubicat1") {} protected: - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPoint dst[7]; for (int outer = 0; outer < loops; ++outer) { SkChopCubicAt2(fPts, dst, 0.5f); diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp index 320ff00f14..55690a4323 100644 --- a/bench/GrMemoryPoolBench.cpp +++ b/bench/GrMemoryPoolBench.cpp @@ -32,7 +32,7 @@ GrMemoryPool A::gBenchPool(10 * (1 << 10), 10 * (1 << 10)); */ class GrMemoryPoolBenchStack : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -94,7 +94,7 @@ GrMemoryPool B::gBenchPool(10 * (1 << 10), 10 * (1 << 10)); */ class GrMemoryPoolBenchRandom : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -142,7 +142,7 @@ class GrMemoryPoolBenchQueue : public Benchmark { M = 4 * (1 << 10), }; public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } diff --git a/bench/GrOrderedSetBench.cpp b/bench/GrOrderedSetBench.cpp index 280ed2cc35..f532a83b36 100644 --- a/bench/GrOrderedSetBench.cpp +++ b/bench/GrOrderedSetBench.cpp @@ -21,25 +21,25 @@ public: fName.append("ordered_set_build"); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return kNonRendering_Backend == backend; } virtual ~GrOrderedSetBuildBench() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkRandom rand; for (int j = 0; j < NUM_ELEMENTS; ++j) { fData[j] = rand.nextU() % NUM_ELEMENTS; } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; ++i) { GrOrderedSet<int> set; for (int j = 0; j < NUM_ELEMENTS; ++j) { @@ -62,18 +62,18 @@ public: fName.append("ordered_set_find"); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return kNonRendering_Backend == backend; } virtual ~GrOrderedSetFindBench() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkRandom rand; for (int j = 0; j < NUM_ELEMENTS; ++j) { fData[j] = rand.nextU() % 1500; @@ -81,7 +81,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; ++i) { for (int j = 0; j < NUM_ELEMENTS; ++j) { fSet.find(fData[j]); @@ -103,25 +103,25 @@ public: fName.append("ordered_set_remove"); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return kNonRendering_Backend == backend; } virtual ~GrOrderedSetRemoveBench() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkRandom rand; for (int j = 0; j < NUM_ELEMENTS; ++j) { fSet.insert(rand.nextU() % NUM_ELEMENTS); } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { typedef GrOrderedSet<int>::Iter SetIter; for (int i = 0; i < loops; ++i) { GrOrderedSet<int> testSet; diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index def736c8b8..5807654ca9 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -36,7 +36,7 @@ public: } private: - size_t onGpuMemorySize() const SK_OVERRIDE { return 100; } + size_t onGpuMemorySize() const override { return 100; } typedef GrGpuResource INHERITED; }; @@ -53,16 +53,16 @@ static void populate_cache(GrGpu* gpu, int resourceCount) { class GrResourceCacheBenchAdd : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "grresourcecache_add"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkAutoTUnref<GrContext> context(GrContext::CreateMockContext()); if (NULL == context) { return; @@ -90,16 +90,16 @@ private: class GrResourceCacheBenchFind : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "grresourcecache_find"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fContext.reset(GrContext::CreateMockContext()); if (!fContext) { return; @@ -118,7 +118,7 @@ protected: populate_cache(gpu, CACHE_SIZE_COUNT); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { if (!fContext) { return; } diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp index f52fc3b1ff..5b77ff8b49 100644 --- a/bench/HairlinePathBench.cpp +++ b/bench/HairlinePathBench.cpp @@ -42,7 +42,7 @@ public: virtual void makePath(SkPath*) = 0; protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { fName.printf("path_hairline_%s_%s_", fFlags & kBig_Flag ? "big" : "small", fFlags & kAA_Flag ? "AA" : "noAA"); @@ -50,7 +50,7 @@ protected: return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint(fPaint); this->setupPaint(&paint); @@ -80,10 +80,10 @@ class LinePathBench : public HairlinePathBench { public: LinePathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("line"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRandom rand; int size = SK_ARRAY_COUNT(points); int hSize = size / 2; @@ -112,10 +112,10 @@ class QuadPathBench : public HairlinePathBench { public: QuadPathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("quad"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRandom rand; int size = SK_ARRAY_COUNT(points); int hSize = size / 2; @@ -144,10 +144,10 @@ class ConicPathBench : public HairlinePathBench { public: ConicPathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("conic"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRandom rand; SkRandom randWeight; int size = SK_ARRAY_COUNT(points); @@ -180,10 +180,10 @@ class CubicPathBench : public HairlinePathBench { public: CubicPathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("cubic"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRandom rand; int size = SK_ARRAY_COUNT(points); int hSize = size / 2; diff --git a/bench/ImageCacheBench.cpp b/bench/ImageCacheBench.cpp index 75adc50dcb..4a068b03ab 100644 --- a/bench/ImageCacheBench.cpp +++ b/bench/ImageCacheBench.cpp @@ -24,8 +24,8 @@ struct TestRec : public SkResourceCache::Rec { TestRec(const TestKey& key, intptr_t value) : fKey(key), fValue(value) {} - const Key& getKey() const SK_OVERRIDE { return fKey; } - size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(fValue); } + const Key& getKey() const override { return fKey; } + size_t bytesUsed() const override { return sizeof(fKey) + sizeof(fValue); } static bool Visitor(const SkResourceCache::Rec&, void*) { return true; @@ -49,11 +49,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "imagecache"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { if (fCache.getTotalBytesUsed() == 0) { this->populateCache(); } diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp index 4e56c72f57..c631c99262 100644 --- a/bench/ImageFilterCollapse.cpp +++ b/bench/ImageFilterCollapse.cpp @@ -39,7 +39,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { makeBitmap(); for(int i = 0; i < loops; i++) { @@ -79,11 +79,11 @@ public: virtual ~TableCollapseBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + virtual const char* onGetName() override { return "image_filter_collapse_table"; } - virtual void onPreDraw() SK_OVERRIDE { + virtual void onPreDraw() override { for (int i = 0; i < 256; ++i) { int n = i >> 5; table1[i] = (n << 5) | (n << 2) | (n >> 1); @@ -135,11 +135,11 @@ public: virtual ~MatrixCollapseBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + virtual const char* onGetName() override { return "image_filter_collapse_matrix"; } - virtual void onPreDraw() SK_OVERRIDE { + virtual void onPreDraw() override { SkColorFilter* colorFilters[] = { make_brightness(0.1f), make_grayscale(), diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index 0e5d4d1f83..47d59bc782 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -21,11 +21,11 @@ public: ImageFilterDAGBench() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "image_filter_dag"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int j = 0; j < loops; j++) { SkAutoTUnref<SkImageFilter> blur(SkBlurImageFilter::Create(20.0f, 20.0f)); SkImageFilter* inputs[kNumInputs]; diff --git a/bench/InterpBench.cpp b/bench/InterpBench.cpp index c03da4b8cc..9d8f32de03 100644 --- a/bench/InterpBench.cpp +++ b/bench/InterpBench.cpp @@ -22,7 +22,7 @@ public: fDx = 0.1257f; } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -51,7 +51,7 @@ public: Fixed16D16Interp() : INHERITED("16.16") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { SkFixed curr = SkFloatToFixed(fx); SkFixed step = SkFloatToFixed(dx); for (int i = 0; i < count; i += 4) { @@ -70,7 +70,7 @@ public: Fixed32D32Interp() : INHERITED("32.32") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { int64_t curr = (int64_t)(fx * 65536 * 655536); int64_t step = (int64_t)(dx * 65536 * 655536); SkFixed tmp; @@ -101,7 +101,7 @@ public: Fixed16D48Interp() : INHERITED("16.48") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { int64_t curr = (int64_t)(fx * 65536 * 655536 * 65536); int64_t step = (int64_t)(dx * 65536 * 655536 * 65536); SkFixed tmp; @@ -121,7 +121,7 @@ public: FloatInterp() : INHERITED("float") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { SkFixed tmp; for (int i = 0; i < count; i += 4) { tmp = SkFloatToFixed(fx); dst[i + 0] = TILE(tmp, count); fx += dx; @@ -139,7 +139,7 @@ public: DoubleInterp() : INHERITED("double") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { double ffx = fx; double ddx = dx; SkFixed tmp; diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp index ed0c9858ef..a56ed226e2 100644 --- a/bench/LightingBench.cpp +++ b/bench/LightingBench.cpp @@ -101,11 +101,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingpointlitdiffuse_small" : "lightingpointlitdiffuse_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreatePointLitDiffuse(getPointLocation(), getWhite(), getSurfaceScale(), @@ -122,11 +122,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingdistantlitdiffuse_small" : "lightingdistantlitdiffuse_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitDiffuse(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -143,11 +143,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingspotlitdiffuse_small" : "lightingspotlitdiffuse_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitDiffuse(getSpotLocation(), getSpotTarget(), getSpotExponent(), @@ -167,11 +167,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingpointlitspecular_small" : "lightingpointlitspecular_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreatePointLitSpecular(getPointLocation(), getWhite(), getSurfaceScale(), @@ -189,11 +189,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingdistantlitspecular_small" : "lightingdistantlitspecular_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitSpecular(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -211,11 +211,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "lightingspotlitspecular_small" : "lightingspotlitspecular_large"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitSpecular(getSpotLocation(), getSpotTarget(), getSpotExponent(), diff --git a/bench/LineBench.cpp b/bench/LineBench.cpp index e5065d2dab..76231b8e95 100644 --- a/bench/LineBench.cpp +++ b/bench/LineBench.cpp @@ -38,11 +38,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; this->setupPaint(&paint); diff --git a/bench/MagnifierBench.cpp b/bench/MagnifierBench.cpp index 39bec98e28..24bd53c88f 100644 --- a/bench/MagnifierBench.cpp +++ b/bench/MagnifierBench.cpp @@ -22,18 +22,18 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "magnifier_small" : "magnifier_large"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInitialized) { make_checkerboard(); fInitialized = true; } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { const int w = fIsSmall ? FILTER_WIDTH_SMALL : FILTER_WIDTH_LARGE; const int h = fIsSmall ? FILTER_HEIGHT_SMALL : FILTER_HEIGHT_LARGE; SkPaint paint; diff --git a/bench/MathBench.cpp b/bench/MathBench.cpp index 5b46d1c704..16a6a5a47f 100644 --- a/bench/MathBench.cpp +++ b/bench/MathBench.cpp @@ -31,7 +31,7 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -68,7 +68,7 @@ protected: virtual void performTest(float* SK_RESTRICT dst, const float* SK_RESTRICT src, - int count) SK_OVERRIDE { + int count) override { uint32_t* d = SkTCast<uint32_t*>(dst); const uint32_t* s = SkTCast<const uint32_t*>(src); this->performITest(d, s, count); @@ -166,7 +166,7 @@ public: protected: virtual void performITest(uint32_t* SK_RESTRICT dst, const uint32_t* SK_RESTRICT src, - int count) SK_OVERRIDE { + int count) override { for (int i = 0; i < count; ++i) { dst[i] = QMul64(src[i], (uint8_t)i); } @@ -181,7 +181,7 @@ public: protected: virtual void performITest(uint32_t* SK_RESTRICT dst, const uint32_t* SK_RESTRICT src, - int count) SK_OVERRIDE { + int count) override { for (int i = 0; i < count; ++i) { dst[i] = SkAlphaMulQ(src[i], (uint8_t)i); } @@ -285,7 +285,7 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -353,7 +353,7 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -414,7 +414,7 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -470,7 +470,7 @@ public: fName = "point_normalize"; } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -517,7 +517,7 @@ public: } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -553,7 +553,7 @@ public: fName.printf("divmod_%s", name); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } diff --git a/bench/Matrix44Bench.cpp b/bench/Matrix44Bench.cpp index 3739458b22..5093fd2745 100644 --- a/bench/Matrix44Bench.cpp +++ b/bench/Matrix44Bench.cpp @@ -17,7 +17,7 @@ public: fName.printf("matrix44_%s", name); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp index 1d8e81115b..6bd1e2a8a6 100644 --- a/bench/MatrixBench.cpp +++ b/bench/MatrixBench.cpp @@ -18,7 +18,7 @@ public: fName.printf("matrix_%s", name); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -290,7 +290,7 @@ public: } } - void performTest() SK_OVERRIDE { + void performTest() override { if (fNewWay) { for (int i = 0; i < 1000000; ++i) { fM.mapPts(fDst, fSrc, N); diff --git a/bench/MemcpyBench.cpp b/bench/MemcpyBench.cpp index 4778d548d7..4bc1285607 100644 --- a/bench/MemcpyBench.cpp +++ b/bench/MemcpyBench.cpp @@ -18,15 +18,15 @@ public: , fMemcpy32(memcpy32) , fName(SkStringPrintf("%s_%d", name, count)) {} - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fDst.reset(fCount); fSrc.reset(fCount); @@ -36,7 +36,7 @@ public: } } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; i++) { fMemcpy32(fDst, fSrc, fCount); } diff --git a/bench/MemoryBench.cpp b/bench/MemoryBench.cpp index c2c9a1ae33..2b0f2abc79 100644 --- a/bench/MemoryBench.cpp +++ b/bench/MemoryBench.cpp @@ -21,16 +21,16 @@ public: fName.printf("chunkalloc_" SK_SIZE_T_SPECIFIER, minSize); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { size_t inc = fMinSize >> 4; SkASSERT(inc > 0); size_t total = fMinSize * 64; diff --git a/bench/MemsetBench.cpp b/bench/MemsetBench.cpp index 41b802c36d..e0390bba38 100644 --- a/bench/MemsetBench.cpp +++ b/bench/MemsetBench.cpp @@ -35,18 +35,18 @@ public: fName.printf("memset%d_%d_%d", type, minSize, maxSize); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } virtual void performTest() = 0; protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; ++i) { this->performTest(); } @@ -63,7 +63,7 @@ public: : INHERITED(MEMSET32, minSize, maxSize) {} protected: - void performTest() SK_OVERRIDE { + void performTest() override { for(int j = fMinSize; j < fMaxSize; ++j){ sk_memset32(kBuffer, VALUE32, j); sk_memset32(kBuffer + 1, VALUE32, j); @@ -82,7 +82,7 @@ public: : INHERITED(MEMSET16, minSize, maxSize) {} protected: - void performTest() SK_OVERRIDE { + void performTest() override { for(int j = fMinSize; j < fMaxSize; ++j){ sk_memset16(kBuffer, VALUE16, j); sk_memset16(kBuffer + 1, VALUE16, j); diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 1e8069ee0e..05d6822f4c 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -20,11 +20,11 @@ public: MergeBench(bool small) : fIsSmall(small), fInitialized(false) { } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "merge_small" : "merge_large"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInitialized) { make_bitmap(); make_checkerboard(); @@ -32,7 +32,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) : SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE); SkPaint paint; diff --git a/bench/MipMapBench.cpp b/bench/MipMapBench.cpp index cb4658ae0f..a8156ed5f9 100644 --- a/bench/MipMapBench.cpp +++ b/bench/MipMapBench.cpp @@ -16,18 +16,18 @@ public: MipMapBench() {} protected: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return kNonRendering_Backend == backend; } - const char* onGetName() SK_OVERRIDE { return "mipmap_build"; } + const char* onGetName() override { return "mipmap_build"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fBitmap.allocN32Pixels(1000, 1000, true); fBitmap.eraseColor(SK_ColorWHITE); // so we don't read uninitialized memory } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; i++) { SkMipMap::Build(fBitmap, NULL)->unref(); } diff --git a/bench/MutexBench.cpp b/bench/MutexBench.cpp index b9d54f190c..7fd8fabba1 100644 --- a/bench/MutexBench.cpp +++ b/bench/MutexBench.cpp @@ -9,7 +9,7 @@ class MutexBench : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } diff --git a/bench/PMFloatBench.cpp b/bench/PMFloatBench.cpp index 62dc444d58..d748144c4b 100644 --- a/bench/PMFloatBench.cpp +++ b/bench/PMFloatBench.cpp @@ -24,7 +24,7 @@ template <bool kClamp, bool kWide> struct PMFloatGetSetBench : public Benchmark { PMFloatGetSetBench() {} - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { switch (kClamp << 1 | kWide) { case 0: return "SkPMFloat_get_1x"; case 1: return "SkPMFloat_get_4x"; @@ -34,9 +34,9 @@ struct PMFloatGetSetBench : public Benchmark { SkFAIL("unreachable"); return "oh bother"; } - bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { // Unlike blackhole, junk can and probably will be a register. uint32_t junk = 0; uint32_t seed = 0; diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp index cc9cb84438..097e68ec8c 100644 --- a/bench/PatchBench.cpp +++ b/bench/PatchBench.cpp @@ -82,7 +82,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { SkString vertexMode; switch (fVertexMode) { case kNone_VertexMode: @@ -107,7 +107,7 @@ protected: return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { this->setCubics(); this->setColors(); this->setTexCoords(); @@ -123,7 +123,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { canvas->scale(fScale.x(), fScale.y()); for (int i = 0; i < loops; i++) { switch (fVertexMode) { @@ -161,11 +161,11 @@ public: SquarePatchBench(SkPoint scale, VertexMode vertexMode) : INHERITED(scale, vertexMode) { } - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("square"); } - void setCubics() SK_OVERRIDE { + void setCubics() override { const SkPoint points[SkPatchUtils::kNumCtrlPts] = { //top points {100,100},{150,100},{250,100}, {300,100}, @@ -187,11 +187,11 @@ public: LODDiffPatchBench(SkPoint scale, VertexMode vertexMode) : INHERITED(scale, vertexMode) { } - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("LOD_Diff"); } - void setCubics() SK_OVERRIDE { + void setCubics() override { const SkPoint points[SkPatchUtils::kNumCtrlPts] = { //top points {100,175},{150,100},{250,100}, {300,0}, @@ -213,11 +213,11 @@ public: LoopPatchBench(SkPoint scale, VertexMode vertexMode) : INHERITED(scale, vertexMode) { } - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("loop"); } - void setCubics() SK_OVERRIDE { + void setCubics() override { const SkPoint points[SkPatchUtils::kNumCtrlPts] = { //top points {100,100},{300,200},{100,200}, {300,100}, diff --git a/bench/PatchGridBench.cpp b/bench/PatchGridBench.cpp index 0fe12e2f8f..610d8e7232 100644 --- a/bench/PatchGridBench.cpp +++ b/bench/PatchGridBench.cpp @@ -163,7 +163,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { SkString vertexMode; switch (fVertexMode) { case kNone_VertexMode: @@ -200,7 +200,7 @@ protected: return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { this->setGrid(); switch (fVertexMode) { case kTexCoords_VertexMode: @@ -214,7 +214,7 @@ protected: this->setupPaint(&fPaint); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { this->setScale(canvas); for (int i = 0; i < loops; i++) { fGrid.draw(canvas, fPaint); diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp index 3a4eb63830..2e91a0b390 100644 --- a/bench/PathBench.cpp +++ b/bench/PathBench.cpp @@ -42,7 +42,7 @@ public: virtual int complexity() { return 0; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { fName.printf("path_%s_%s_", fFlags & kStroke_Flag ? "stroke" : "fill", fFlags & kBig_Flag ? "big" : "small"); @@ -50,7 +50,7 @@ protected: return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint(fPaint); this->setupPaint(&paint); @@ -81,10 +81,10 @@ class TrianglePathBench : public PathBench { public: TrianglePathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("triangle"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { static const int gCoord[] = { 10, 10, 15, 5, 20, 20 }; @@ -101,10 +101,10 @@ class RectPathBench : public PathBench { public: RectPathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("rect"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRect r = { 10, 10, 20, 20 }; path->addRect(r); } @@ -116,10 +116,10 @@ class OvalPathBench : public PathBench { public: OvalPathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("oval"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRect r = { 10, 10, 23, 20 }; path->addOval(r); } @@ -131,10 +131,10 @@ class CirclePathBench: public PathBench { public: CirclePathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("circle"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { path->addCircle(SkIntToScalar(20), SkIntToScalar(20), SkIntToScalar(10)); } @@ -146,7 +146,7 @@ class SawToothPathBench : public PathBench { public: SawToothPathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("sawtooth"); } virtual void makePath(SkPath* path) { @@ -167,7 +167,7 @@ public: path->lineTo(x0, y + 2 * dy); path->close(); } - int complexity() SK_OVERRIDE { return 1; } + int complexity() override { return 1; } private: typedef PathBench INHERITED; }; @@ -176,10 +176,10 @@ class LongCurvedPathBench : public PathBench { public: LongCurvedPathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("long_curved"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRandom rand (12); int i; for (i = 0; i < 100; i++) { @@ -190,7 +190,7 @@ public: } path->close(); } - int complexity() SK_OVERRIDE { return 2; } + int complexity() override { return 2; } private: typedef PathBench INHERITED; }; @@ -199,24 +199,24 @@ class LongLinePathBench : public PathBench { public: LongLinePathBench(Flags flags) : INHERITED(flags) {} - void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) override { name->append("long_line"); } - void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) override { SkRandom rand; path->moveTo(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480); for (size_t i = 1; i < 100; i++) { path->lineTo(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480); } } - int complexity() SK_OVERRIDE { return 2; } + int complexity() override { return 2; } private: typedef PathBench INHERITED; }; class RandomPathBench : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -321,15 +321,15 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "path_create"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { this->createData(10, 100); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; ++i) { if (i % 1000 == 0) { fPath.reset(); // PathRef memory can grow without bound otherwise. @@ -351,10 +351,10 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "path_copy"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { this->createData(10, 100); fPaths.reset(kPathCnt); fCopies.reset(kPathCnt); @@ -363,7 +363,7 @@ protected: } this->finishedMakingPaths(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; ++i) { int idx = i & (kPathCnt - 1); fCopies[idx] = fPaths[idx]; @@ -386,11 +386,11 @@ public: PathTransformBench(bool inPlace) : fInPlace(inPlace) {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fInPlace ? "path_transform_in_place" : "path_transform_copy"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fMatrix.setScale(5 * SK_Scalar1, 6 * SK_Scalar1); this->createData(10, 100); fPaths.reset(kPathCnt); @@ -403,7 +403,7 @@ protected: } } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { if (fInPlace) { for (int i = 0; i < loops; ++i) { fPaths[i & (kPathCnt - 1)].transform(fMatrix); @@ -434,11 +434,11 @@ public: PathEqualityBench() { } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "path_equality_50%"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fParity = 0; this->createData(10, 100); fPaths.reset(kPathCnt); @@ -450,7 +450,7 @@ protected: this->finishedMakingPaths(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; ++i) { int idx = i & (kPathCnt - 1); fParity ^= (fPaths[idx] == fCopies[idx & ~0x1]); @@ -483,7 +483,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { switch (fType) { case kAdd_AddType: return "path_add_path"; @@ -501,7 +501,7 @@ protected: } } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { // reversePathTo assumes a single contour path. bool allowMoves = kReversePathTo_AddType != fType; this->createData(10, 100, allowMoves); @@ -514,7 +514,7 @@ protected: this->finishedMakingPaths(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { switch (fType) { case kAdd_AddType: for (int i = 0; i < loops; ++i) { @@ -578,11 +578,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; paint.setColor(SK_ColorBLACK); @@ -642,7 +642,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } @@ -688,7 +688,7 @@ protected: SkASSERT(path->isConvex()); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom rand; SkRect r; @@ -753,23 +753,23 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } private: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; ++i) { const SkRect& rect = fQueryRects[i % kQueryRectCnt]; fParity = fParity != fPath.conservativelyContainsRect(rect); } } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fQueryRects.setCount(kQueryRectCnt); SkRandom rand; @@ -817,11 +817,11 @@ public: } private: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "ratquad-chop-0.5"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { SkConic dst[2]; for (int i = 0; i < loops; ++i) { fRQ.chopAt(0.5f, dst); @@ -846,14 +846,14 @@ public: fName.printf("conic-chop-half%d", useV2); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } private: - const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { if (fUseV2) { for (int i = 0; i < loops; ++i) { fRQ.chop2(fDst); @@ -875,7 +875,7 @@ public: ConicBench_EvalPos(bool useV2) : ConicBench_ChopHalf(useV2) { fName.printf("conic-eval-pos%d", useV2); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { if (fUseV2) { for (int i = 0; i < loops; ++i) { for (int j = 0; j < 1000; ++j) { @@ -899,7 +899,7 @@ public: ConicBench_EvalTan(bool useV2) : ConicBench_ChopHalf(useV2) { fName.printf("conic-eval-tan%d", useV2); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { if (fUseV2) { for (int i = 0; i < loops; ++i) { for (int j = 0; j < 1000; ++j) { @@ -940,7 +940,7 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -959,11 +959,11 @@ public: ConicBench_ComputeError() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "conic-compute-error"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { SkVector err; for (int i = 0; i < loops; ++i) { for (int j = 0; j < CONICS; ++j) { @@ -981,11 +981,11 @@ public: ConicBench_asQuadTol() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "conic-asQuadTol"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; ++i) { for (int j = 0; j < CONICS; ++j) { fConics[j].asQuadTol(SK_ScalarHalf); @@ -1002,11 +1002,11 @@ public: ConicBench_quadPow2() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "conic-quadPow2"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; ++i) { for (int j = 0; j < CONICS; ++j) { fConics[j].computeQuadPOW2(SK_ScalarHalf); diff --git a/bench/PathIterBench.cpp b/bench/PathIterBench.cpp index c7a04bdd79..bbc3c035e7 100644 --- a/bench/PathIterBench.cpp +++ b/bench/PathIterBench.cpp @@ -56,16 +56,16 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { if (fRaw) { for (int i = 0; i < loops; ++i) { SkPath::RawIter iter(fPath); diff --git a/bench/PerlinNoiseBench.cpp b/bench/PerlinNoiseBench.cpp index 17260a9cb8..b8237c0655 100644 --- a/bench/PerlinNoiseBench.cpp +++ b/bench/PerlinNoiseBench.cpp @@ -17,11 +17,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "perlinnoise"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { this->test(loops, canvas, 0, 0, SkPerlinNoiseShader::kFractalNoise_Type, 0.1f, 0.1f, 3, 0, false); } diff --git a/bench/PictureNestingBench.cpp b/bench/PictureNestingBench.cpp index b2220b7ed4..a649dcc636 100644 --- a/bench/PictureNestingBench.cpp +++ b/bench/PictureNestingBench.cpp @@ -26,7 +26,7 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } @@ -139,7 +139,7 @@ public: : INHERITED("playback", maxLevel, maxPictureLevel) { } protected: - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { this->INHERITED::onPreDraw(); SkIPoint canvasSize = onGetSize(); diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp index 67945ce001..e11d7c8360 100644 --- a/bench/PicturePlaybackBench.cpp +++ b/bench/PicturePlaybackBench.cpp @@ -72,7 +72,7 @@ class TextPlaybackBench : public PicturePlaybackBench { public: TextPlaybackBench() : INHERITED("drawText") { } protected: - void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { + void recordCanvas(SkCanvas* canvas) override { SkPaint paint; paint.setTextSize(fTextSize); paint.setColor(SK_ColorBLACK); @@ -97,7 +97,7 @@ public: : INHERITED(drawPosH ? "drawPosTextH" : "drawPosText") , fDrawPosH(drawPosH) { } protected: - void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { + void recordCanvas(SkCanvas* canvas) override { SkPaint paint; paint.setTextSize(fTextSize); paint.setColor(SK_ColorBLACK); @@ -159,10 +159,10 @@ public: } } - const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(1024,1024); } + const char* onGetName() override { return fName.c_str(); } + SkIPoint onGetSize() override { return SkIPoint::Make(1024,1024); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkAutoTDelete<SkBBHFactory> factory; switch (fBBH) { case kNone: break; @@ -185,7 +185,7 @@ public: fPic.reset(recorder.endRecording()); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; i++) { // This inner loop guarantees we make the same choices for all bench variants. SkRandom rand; diff --git a/bench/PremulAndUnpremulAlphaOpsBench.cpp b/bench/PremulAndUnpremulAlphaOpsBench.cpp index 4d9dbcd623..6e795417a6 100644 --- a/bench/PremulAndUnpremulAlphaOpsBench.cpp +++ b/bench/PremulAndUnpremulAlphaOpsBench.cpp @@ -25,11 +25,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkImageInfo info = SkImageInfo::Make(W, H, fColorType, kUnpremul_SkAlphaType); fBmp1.allocPixels(info); // used in writePixels @@ -43,7 +43,7 @@ protected: fBmp2.allocPixels(info); // used in readPixels() } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { canvas->clear(SK_ColorBLACK); for (int loop = 0; loop < loops; ++loop) { diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp index cdbdf35e01..6f76bd19bd 100644 --- a/bench/RTreeBench.cpp +++ b/bench/RTreeBench.cpp @@ -26,15 +26,15 @@ public: fName.printf("rtree_%s_build", name); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom rand; SkAutoTMalloc<SkRect> rects(NUM_BUILD_RECTS); for (int i = 0; i < NUM_BUILD_RECTS; ++i) { @@ -60,14 +60,14 @@ public: fName.printf("rtree_%s_query", name); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkRandom rand; SkAutoTMalloc<SkRect> rects(NUM_QUERY_RECTS); for (int i = 0; i < NUM_QUERY_RECTS; ++i) { @@ -76,7 +76,7 @@ protected: fTree.insert(rects.get(), NUM_QUERY_RECTS); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom rand; for (int i = 0; i < loops; ++i) { SkTDArray<unsigned> hits; diff --git a/bench/ReadPixBench.cpp b/bench/ReadPixBench.cpp index f019401ea3..917b917ab6 100644 --- a/bench/ReadPixBench.cpp +++ b/bench/ReadPixBench.cpp @@ -20,11 +20,11 @@ public: ReadPixBench() {} protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "readpix"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { canvas->clear(SK_ColorBLACK); SkISize size = canvas->getDeviceSize(); diff --git a/bench/RecordingBench.h b/bench/RecordingBench.h index 783596d827..6cb5d51326 100644 --- a/bench/RecordingBench.h +++ b/bench/RecordingBench.h @@ -16,10 +16,10 @@ public: RecordingBench(const char* name, const SkPicture*, bool useBBH); protected: - const char* onGetName() SK_OVERRIDE; - bool isSuitableFor(Backend) SK_OVERRIDE; - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE; - SkIPoint onGetSize() SK_OVERRIDE; + const char* onGetName() override; + bool isSuitableFor(Backend) override; + void onDraw(const int loops, SkCanvas*) override; + SkIPoint onGetSize() override; private: SkAutoTUnref<const SkPicture> fSrc; diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp index 6228e00a57..4aa6b8bd1a 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -92,14 +92,14 @@ public: } protected: - void setupPaint(SkPaint* paint) SK_OVERRIDE { + void setupPaint(SkPaint* paint) override { this->INHERITED::setupPaint(paint); // srcmode is most interesting when we're not opaque paint->setAlpha(0x80); paint->setXfermode(fMode); } - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { fName.set(this->INHERITED::onGetName()); fName.prepend("srcmode_"); return fName.c_str(); diff --git a/bench/RectanizerBench.cpp b/bench/RectanizerBench.cpp index a5fad06366..f7e1f04ac8 100644 --- a/bench/RectanizerBench.cpp +++ b/bench/RectanizerBench.cpp @@ -64,15 +64,15 @@ public: } protected: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return kNonRendering_Backend == backend; } - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkASSERT(NULL == fRectanizer.get()); if (kPow2_RectanizerType == fRectanizerType) { @@ -83,7 +83,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom rand; SkIPoint16 loc; SkISize size; diff --git a/bench/RectoriBench.cpp b/bench/RectoriBench.cpp index de725a7cb2..b777fbe0eb 100644 --- a/bench/RectoriBench.cpp +++ b/bench/RectoriBench.cpp @@ -20,11 +20,11 @@ public: protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "rectori"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom Random; for (int i = 0; i < loops; i++) { diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp index 7aa5746318..aacdf18edb 100644 --- a/bench/RefCntBench.cpp +++ b/bench/RefCntBench.cpp @@ -18,7 +18,7 @@ class AtomicInc32 : public Benchmark { public: AtomicInc32() : fX(0) {} - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -42,7 +42,7 @@ class AtomicInc64 : public Benchmark { public: AtomicInc64() : fX(0) {} - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -64,7 +64,7 @@ private: class RefCntBench_Stack : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -100,7 +100,7 @@ private: class RefCntBench_Heap : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -127,7 +127,7 @@ private: class RefCntBench_New : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -155,7 +155,7 @@ private: class WeakRefCntBench_Stack : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -186,16 +186,16 @@ public: class WeakRefCntBench_Heap : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "ref_cnt_heap_weak"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { char memory[sizeof(PlacedWeakRefCnt)]; for (int i = 0; i < loops; ++i) { PlacedWeakRefCnt* ref = new (memory) PlacedWeakRefCnt(); @@ -213,16 +213,16 @@ private: class WeakRefCntBench_New : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "ref_cnt_new_weak"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { for (int i = 0; i < loops; ++i) { SkWeakRefCnt* ref = new SkWeakRefCnt(); for (int j = 0; j < M; ++j) { diff --git a/bench/RegionBench.cpp b/bench/RegionBench.cpp index 5cd6779cb7..84e8d1b057 100644 --- a/bench/RegionBench.cpp +++ b/bench/RegionBench.cpp @@ -99,7 +99,7 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } diff --git a/bench/RegionContainBench.cpp b/bench/RegionContainBench.cpp index 3a0980907a..dfee9561b5 100644 --- a/bench/RegionContainBench.cpp +++ b/bench/RegionContainBench.cpp @@ -45,14 +45,14 @@ public: fB.setRect(0, 0, H, W); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { Proc proc = fProc; for (int i = 0; i < loops; ++i) { diff --git a/bench/RepeatTileBench.cpp b/bench/RepeatTileBench.cpp index 0e63336a0f..afbc5b27f1 100644 --- a/bench/RepeatTileBench.cpp +++ b/bench/RepeatTileBench.cpp @@ -104,11 +104,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fBitmap.allocPixels(); fBitmap.eraseColor(kOpaque_SkAlphaType == fAlphaType ? SK_ColorWHITE : 0); @@ -127,7 +127,7 @@ protected: } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint(fPaint); this->setupPaint(&paint); diff --git a/bench/RotatedRectBench.cpp b/bench/RotatedRectBench.cpp index 90bf611eb4..c37a6bef09 100644 --- a/bench/RotatedRectBench.cpp +++ b/bench/RotatedRectBench.cpp @@ -75,9 +75,9 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkPaint paint; paint.setAntiAlias(fAA); paint.setXfermodeMode(fMode); diff --git a/bench/SKPBench.h b/bench/SKPBench.h index 36d7dfd4cf..f17281c13a 100644 --- a/bench/SKPBench.h +++ b/bench/SKPBench.h @@ -19,16 +19,16 @@ class SKPBench : public Benchmark { public: SKPBench(const char* name, const SkPicture*, const SkIRect& devClip, SkScalar scale, bool useMultiPictureDraw); - ~SKPBench() SK_OVERRIDE; + ~SKPBench() override; protected: - const char* onGetName() SK_OVERRIDE; - const char* onGetUniqueName() SK_OVERRIDE; - void onPerCanvasPreDraw(SkCanvas*) SK_OVERRIDE; - void onPerCanvasPostDraw(SkCanvas*) SK_OVERRIDE; - bool isSuitableFor(Backend backend) SK_OVERRIDE; - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE; - SkIPoint onGetSize() SK_OVERRIDE; + const char* onGetName() override; + const char* onGetUniqueName() override; + void onPerCanvasPreDraw(SkCanvas*) override; + void onPerCanvasPostDraw(SkCanvas*) override; + bool isSuitableFor(Backend backend) override; + void onDraw(const int loops, SkCanvas* canvas) override; + SkIPoint onGetSize() override; private: SkAutoTUnref<const SkPicture> fPic; diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp index f1a9b9adee..2c59fa5a32 100644 --- a/bench/ScalarBench.cpp +++ b/bench/ScalarBench.cpp @@ -18,7 +18,7 @@ public: fName.printf("scalar_%s", name); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -27,11 +27,11 @@ public: protected: virtual int mulLoopCount() const { return 1; } - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; i++) { this->performTest(); } @@ -101,8 +101,8 @@ public: } } protected: - int mulLoopCount() const SK_OVERRIDE { return 1; } - void performTest() SK_OVERRIDE { + int mulLoopCount() const override { return 1; } + void performTest() override { int sum = 0; for (size_t i = 0; i < ARRAY_N; ++i) { // We pass -fArray[i], so the compiler can't cheat and treat the @@ -140,16 +140,16 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "rect_bounds"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r; for (int i = 0; i < loops; ++i) { for (int i = 0; i < 1000; ++i) { diff --git a/bench/SkipZeroesBench.cpp b/bench/SkipZeroesBench.cpp index 1587e01f11..7840a8aacb 100644 --- a/bench/SkipZeroesBench.cpp +++ b/bench/SkipZeroesBench.cpp @@ -36,16 +36,16 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkString resourcePath = GetResourcePath(); if (resourcePath.isEmpty()) { fValid = false; @@ -73,7 +73,7 @@ protected: } } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { if (!fValid) { #ifdef SK_DEBUG SkDebugf("stream was invalid: %s\n", fFilename.c_str()); diff --git a/bench/SortBench.cpp b/bench/SortBench.cpp index b46b805890..4cf91ba82e 100644 --- a/bench/SortBench.cpp +++ b/bench/SortBench.cpp @@ -107,22 +107,22 @@ public: fName.printf("sort_%s_%s", gSorts[s].fName, gRec[t].fName); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } // Delayed initialization only done if onDraw will be called. - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fUnsorted.reset(N); gRec[fType].fProc(fUnsorted.get()); } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { SkAutoTMalloc<int> sorted(N); for (int i = 0; i < loops; i++) { memcpy(sorted.get(), fUnsorted.get(), N*sizeof(int)); diff --git a/bench/WritePixelsBench.cpp b/bench/WritePixelsBench.cpp index 3353ba2b8d..3ee90345fa 100644 --- a/bench/WritePixelsBench.cpp +++ b/bench/WritePixelsBench.cpp @@ -41,11 +41,11 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkISize size = canvas->getDeviceSize(); canvas->clear(0xFFFF0000); diff --git a/bench/WriterBench.cpp b/bench/WriterBench.cpp index 4dcd3a3d07..6db1cf19fe 100644 --- a/bench/WriterBench.cpp +++ b/bench/WriterBench.cpp @@ -12,16 +12,16 @@ class WriterBench : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "writer"; } - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) override { static const char gStr[] = "abcdefghimjklmnopqrstuvwxyz"; static const size_t gLen = strlen(gStr); SkWriter32 writer; diff --git a/bench/XfermodeBench.cpp b/bench/XfermodeBench.cpp index 4afd06b261..c5cb714104 100644 --- a/bench/XfermodeBench.cpp +++ b/bench/XfermodeBench.cpp @@ -29,9 +29,9 @@ public: } protected: - const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkISize size = canvas->getDeviceSize(); SkRandom random; for (int i = 0; i < loops; ++i) { @@ -63,14 +63,14 @@ private: class XferCreateBench : public Benchmark { public: - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { return "xfermode_create"; } + const char* onGetName() override { return "xfermode_create"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int outer = 0; outer < loops * 10; ++outer) { for (int i = 0; i <= SkXfermode::kLastMode; ++i) { SkXfermode* xfer = SkXfermode::Create(SkXfermode::Mode(i)); |