diff options
619 files changed, 2934 insertions, 2934 deletions
diff --git a/bench/AlternatingColorPatternBench.cpp b/bench/AlternatingColorPatternBench.cpp index b497979a89..fccc494e69 100644 --- a/bench/AlternatingColorPatternBench.cpp +++ b/bench/AlternatingColorPatternBench.cpp @@ -108,7 +108,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } @@ -146,7 +146,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(false); paint.setFilterLevel(SkPaint::kLow_FilterLevel); diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp index da2e829a4d..c5efe9e9b8 100644 --- a/bench/BitmapBench.cpp +++ b/bench/BitmapBench.cpp @@ -247,7 +247,7 @@ protected: INHERITED::onDraw(loops, canvas); } - virtual void setupPaint(SkPaint* paint) SK_OVERRIDE { + void setupPaint(SkPaint* paint) SK_OVERRIDE { this->INHERITED::setupPaint(paint); int index = 0; @@ -303,7 +303,7 @@ protected: return fFullName.c_str(); } - virtual void onDrawIntoBitmap(const SkBitmap& bm) SK_OVERRIDE { + void onDrawIntoBitmap(const SkBitmap& bm) SK_OVERRIDE { const int w = bm.width(); const int h = bm.height(); diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp index 2ad7bdf9b5..fb3ebdaf15 100644 --- a/bench/BitmapRectBench.cpp +++ b/bench/BitmapRectBench.cpp @@ -59,7 +59,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { fName.printf("bitmaprect_%02X_%sfilter_%s", fAlpha, SkPaint::kNone_FilterLevel == fFilterLevel ? "no" : "", @@ -67,7 +67,7 @@ protected: return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fBitmap.allocPixels(); fBitmap.setAlphaType(kOpaque_SkAlphaType); fBitmap.eraseColor(SK_ColorBLACK); @@ -87,7 +87,7 @@ protected: } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRandom rand; SkPaint paint; diff --git a/bench/BitmapScaleBench.cpp b/bench/BitmapScaleBench.cpp index 665e294ece..e5cd5873a1 100644 --- a/bench/BitmapScaleBench.cpp +++ b/bench/BitmapScaleBench.cpp @@ -88,7 +88,7 @@ class BitmapFilterScaleBench: public BitmapScaleBench { setName( "filter" ); } protected: - virtual void doScaleImage() SK_OVERRIDE { + void doScaleImage() SK_OVERRIDE { SkCanvas canvas( fOutputBitmap ); SkPaint paint; diff --git a/bench/BlurImageFilterBench.cpp b/bench/BlurImageFilterBench.cpp index 9021d1b1d2..68d0e6c574 100644 --- a/bench/BlurImageFilterBench.cpp +++ b/bench/BlurImageFilterBench.cpp @@ -31,18 +31,18 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInitialized) { make_checkerboard(); fInitialized = true; } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setImageFilter(SkBlurImageFilter::Create(fSigmaX, fSigmaY))->unref(); diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp index cdcdfe57f3..66aff22073 100644 --- a/bench/BlurRectBench.cpp +++ b/bench/BlurRectBench.cpp @@ -88,7 +88,7 @@ class BlurRectDirectBench: public BlurRectBench { this->setName(name); } protected: - virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE { + void makeBlurryRect(const SkRect& r) SK_OVERRIDE { SkMask mask; SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), &mask, r, kNormal_SkBlurStyle); @@ -110,7 +110,7 @@ public: } protected: - virtual void preBenchSetup(const SkRect& r) SK_OVERRIDE { + void preBenchSetup(const SkRect& r) SK_OVERRIDE { SkMask::FreeImage(fSrcMask.fImage); r.roundOut(&fSrcMask.fBounds); @@ -142,7 +142,7 @@ public: protected: - virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE { + void makeBlurryRect(const SkRect&) SK_OVERRIDE { SkMask mask; mask.fImage = NULL; SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()), @@ -169,7 +169,7 @@ public: protected: - virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE { + void makeBlurryRect(const SkRect&) SK_OVERRIDE { SkMask mask; mask.fImage = NULL; SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()), diff --git a/bench/BlurRectsBench.cpp b/bench/BlurRectsBench.cpp index 7b98e00c92..553cf6b398 100644 --- a/bench/BlurRectsBench.cpp +++ b/bench/BlurRectsBench.cpp @@ -21,7 +21,7 @@ public: fInner = inner; } - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } @@ -29,7 +29,7 @@ public: fName = name; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, fRadius))->unref(); diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp index 52de22a4dc..7ec89b8690 100644 --- a/bench/BlurRoundRectBench.cpp +++ b/bench/BlurRoundRectBench.cpp @@ -30,16 +30,16 @@ public: fRRect.setRectXY(r, SkIntToScalar(cornerRadius), SkIntToScalar(cornerRadius)); } - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual SkIPoint onGetSize() SK_OVERRIDE { + SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(SkScalarCeilToInt(fRRect.rect().width()), SkScalarCeilToInt(fRRect.rect().height())); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkLayerDrawLooper::Builder looperBuilder; { SkLayerDrawLooper::LayerInfo info; diff --git a/bench/ChartBench.cpp b/bench/ChartBench.cpp index 8d05ef179a..175e1ddfd3 100644 --- a/bench/ChartBench.cpp +++ b/bench/ChartBench.cpp @@ -94,7 +94,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { if (fAA) { return "chart_aa"; } else { @@ -102,7 +102,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { bool sizeChanged = false; if (canvas->getDeviceSize() != fSize) { fSize = canvas->getDeviceSize(); diff --git a/bench/ChecksumBench.cpp b/bench/ChecksumBench.cpp index 7d3ec9ff9f..661f9e676c 100644 --- a/bench/ChecksumBench.cpp +++ b/bench/ChecksumBench.cpp @@ -35,7 +35,7 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/CmapBench.cpp b/bench/CmapBench.cpp index db4ed74951..ca0b25d282 100644 --- a/bench/CmapBench.cpp +++ b/bench/CmapBench.cpp @@ -81,11 +81,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { fProc(loops, fPaint, fText, sizeof(fText), NGLYPHS); } diff --git a/bench/ColorCubeBench.cpp b/bench/ColorCubeBench.cpp index 141edf62a4..0d1e589d59 100644 --- a/bench/ColorCubeBench.cpp +++ b/bench/ColorCubeBench.cpp @@ -27,22 +27,22 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "colorcube"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!SkToBool(fCubeData)) { this->makeCubeData(); this->make_bitmap(); } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { this->test(loops, canvas); } - virtual SkIPoint onGetSize() SK_OVERRIDE { + SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(fSize.width(), fSize.height()); } diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp index 7eae21aa75..b8cfbc3a80 100644 --- a/bench/ColorFilterBench.cpp +++ b/bench/ColorFilterBench.cpp @@ -68,11 +68,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_dim_bright_small" : "colorfilter_dim_bright_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -98,11 +98,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_bright_gray_small" : "colorfilter_bright_gray_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -125,11 +125,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_gray_bright_small" : "colorfilter_gray_bright_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -152,11 +152,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_blue_bright_small" : "colorfilter_blue_bright_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -179,11 +179,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_bright_blue_small" : "colorfilter_bright_blue_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -206,11 +206,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_bright_small" : "colorfilter_bright_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -232,11 +232,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_blue_small" : "colorfilter_blue_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -258,11 +258,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "colorfilter_gray_small" : "colorfilter_gray_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -284,11 +284,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "table_colorfilter_small" : "table_colorfilter_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); @@ -322,11 +322,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "luma_colorfilter_small" : "luma_colorfilter_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r = getFilterRect(); SkPaint paint; paint.setColor(SK_ColorRED); diff --git a/bench/ColorPrivBench.cpp b/bench/ColorPrivBench.cpp index 01810ed239..4d04e89708 100644 --- a/bench/ColorPrivBench.cpp +++ b/bench/ColorPrivBench.cpp @@ -12,13 +12,13 @@ public: fName.append(kScale ? "_255" : "_256"); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } - virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_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]. } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 ecb0ee6fa7..097a9e1b28 100644 --- a/bench/CoverageBench.cpp +++ b/bench/CoverageBench.cpp @@ -44,11 +44,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 f4d09c66f2..5f209698de 100644 --- a/bench/DashBench.cpp +++ b/bench/DashBench.cpp @@ -57,11 +57,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; this->setupPaint(&paint); paint.setStyle(SkPaint::kStroke_Style); @@ -190,11 +190,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { SkPath dst; for (int i = 0; i < loops; ++i) { SkStrokeRec rec(SkStrokeRec::kHairline_InitStyle); @@ -228,11 +228,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; this->setupPaint(&paint); paint.setStrokeWidth(fStrokeWidth); @@ -267,11 +267,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); @@ -353,11 +353,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint p; this->setupPaint(&p); p.setStyle(SkPaint::kStroke_Style); @@ -393,11 +393,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint p; this->setupPaint(&p); p.setColor(SK_ColorBLACK); diff --git a/bench/DecodeBench.cpp b/bench/DecodeBench.cpp index b03f8980cd..507a7d8e92 100644 --- a/bench/DecodeBench.cpp +++ b/bench/DecodeBench.cpp @@ -24,7 +24,7 @@ public: fName.printf("decode_%s_%s", sk_tool_utils::colortype_name(ct), fname.c_str()); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/DeferredSurfaceCopyBench.cpp b/bench/DeferredSurfaceCopyBench.cpp index e1c3e3b506..e0bf8e7a78 100644 --- a/bench/DeferredSurfaceCopyBench.cpp +++ b/bench/DeferredSurfaceCopyBench.cpp @@ -26,12 +26,12 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fDiscardableContents ? "DeferredSurfaceCopy_discardable" : "DeferredSurfaceCopy_nonDiscardable"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 2a0f7c0bb5..2f9a69e0f8 100644 --- a/bench/DisplacementBench.cpp +++ b/bench/DisplacementBench.cpp @@ -22,7 +22,7 @@ public: } protected: - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInitialized) { this->makeBitmap(); this->makeCheckerboard(); @@ -91,11 +91,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return this->isSmall() ? "displacement_zero_small" : "displacement_zero_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard)); // No displacement effect @@ -118,11 +118,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "displacement_alpha_small" : "displacement_alpha_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return isSmall() ? "displacement_full_small" : "displacement_full_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 4255923c4b..351b0ea09f 100644 --- a/bench/ETCBitmapBench.cpp +++ b/bench/ETCBitmapBench.cpp @@ -122,12 +122,12 @@ public: ETCBitmapBench(bool decompress, Backend backend) : fDecompress(decompress), fBackend(backend) { } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == this->fBackend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { if (kGPU_Backend == this->fBackend) { if (this->fDecompress) { return "etc1bitmap_render_gpu_decompressed"; @@ -144,7 +144,7 @@ protected: } } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (NULL == fPKMData) { SkDebugf("Failed to load PKM data!\n"); return; @@ -162,7 +162,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int i = 0; i < loops; ++i) { canvas->drawBitmap(this->fBitmap, 0, 0, NULL); } @@ -187,7 +187,7 @@ public: : ETCBitmapBench(decompress, backend) { } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { if (kGPU_Backend == this->backend()) { if (this->decompress()) { return "etc1bitmap_upload_gpu_decompressed"; @@ -204,7 +204,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 3c5304294d..af99015a29 100644 --- a/bench/FSRectBench.cpp +++ b/bench/FSRectBench.cpp @@ -20,9 +20,9 @@ public: FSRectBench() : fInit(false) { } protected: - virtual const char* onGetName() SK_OVERRIDE { return "fullscreen_rects"; } + const char* onGetName() SK_OVERRIDE { return "fullscreen_rects"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInit) { SkRandom rand; static const SkScalar kMinOffset = 0; @@ -39,7 +39,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 dbf6b1677b..3bff0637d4 100644 --- a/bench/FontCacheBench.cpp +++ b/bench/FontCacheBench.cpp @@ -28,11 +28,11 @@ public: FontCacheBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "fontcache"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; this->setupPaint(&paint); paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); @@ -104,11 +104,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "fontefficiency"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { static bool gDone; if (gDone) { return; diff --git a/bench/GMBench.h b/bench/GMBench.h index e224052827..43ca9812a1 100644 --- a/bench/GMBench.h +++ b/bench/GMBench.h @@ -21,10 +21,10 @@ public: virtual ~GMBench(); protected: - virtual const char* onGetName() SK_OVERRIDE; - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE; - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE; - virtual SkIPoint onGetSize() SK_OVERRIDE; + const char* onGetName() SK_OVERRIDE; + bool isSuitableFor(Backend backend) SK_OVERRIDE; + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE; + SkIPoint onGetSize() SK_OVERRIDE; private: skiagm::GM* fGM; diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index c37f46df30..bf70b5c0bb 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -74,11 +74,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInitialized) { this->makeCheckerboard(); this->makeAtlas(); @@ -86,7 +86,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRandom scaleRand; SkRandom transRand; SkRandom rotRand; diff --git a/bench/GeometryBench.cpp b/bench/GeometryBench.cpp index a5c4643f9e..fd86effc34 100644 --- a/bench/GeometryBench.cpp +++ b/bench/GeometryBench.cpp @@ -16,11 +16,11 @@ public: fName.printf("geo_%s", suffix); } - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return kNonRendering_Backend == backend; } @@ -65,7 +65,7 @@ public: GeoRectBench_intersect() : GeoRectBench("rect_intersect") {} protected: - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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: - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int outer = 0; outer < loops; ++outer) { int count = 0; SkRect r; @@ -99,7 +99,7 @@ public: GeoRectBench_Intersects() : GeoRectBench("rect_Intersects") {} protected: - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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: - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int outer = 0; outer < loops; ++outer) { for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) { fRects[i].sort(); diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp index 6e6a37e76c..320ff00f14 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: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -94,7 +94,7 @@ GrMemoryPool B::gBenchPool(10 * (1 << 10), 10 * (1 << 10)); */ class GrMemoryPoolBenchRandom : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -142,7 +142,7 @@ class GrMemoryPoolBenchQueue : public Benchmark { M = 4 * (1 << 10), }; public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/GrOrderedSetBench.cpp b/bench/GrOrderedSetBench.cpp index dde1c4a3f0..280ed2cc35 100644 --- a/bench/GrOrderedSetBench.cpp +++ b/bench/GrOrderedSetBench.cpp @@ -21,25 +21,25 @@ public: fName.append("ordered_set_build"); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return kNonRendering_Backend == backend; } virtual ~GrOrderedSetBuildBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { SkRandom rand; for (int j = 0; j < NUM_ELEMENTS; ++j) { fData[j] = rand.nextU() % NUM_ELEMENTS; } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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"); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return kNonRendering_Backend == backend; } virtual ~GrOrderedSetFindBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { SkRandom rand; for (int j = 0; j < NUM_ELEMENTS; ++j) { fData[j] = rand.nextU() % 1500; @@ -81,7 +81,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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"); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return kNonRendering_Backend == backend; } virtual ~GrOrderedSetRemoveBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { SkRandom rand; for (int j = 0; j < NUM_ELEMENTS; ++j) { fSet.insert(rand.nextU() % NUM_ELEMENTS); } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { typedef GrOrderedSet<int>::Iter SetIter; for (int i = 0; i < loops; ++i) { GrOrderedSet<int> testSet; diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp index 37fc57d188..f52fc3b1ff 100644 --- a/bench/HairlinePathBench.cpp +++ b/bench/HairlinePathBench.cpp @@ -42,7 +42,7 @@ public: virtual void makePath(SkPath*) = 0; protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_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(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint(fPaint); this->setupPaint(&paint); @@ -80,10 +80,10 @@ class LinePathBench : public HairlinePathBench { public: LinePathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("line"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_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) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("quad"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_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) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("conic"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_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) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("cubic"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRandom rand; int size = SK_ARRAY_COUNT(points); int hSize = size / 2; diff --git a/bench/ImageCacheBench.cpp b/bench/ImageCacheBench.cpp index b8f40c87fc..1160f9353d 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) {} - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(fValue); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(fValue); } static bool Visitor(const SkResourceCache::Rec&, void*) { return true; @@ -49,11 +49,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "imagecache"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { if (fCache.getTotalBytesUsed() == 0) { this->populateCache(); } diff --git a/bench/ImageDecodeBench.cpp b/bench/ImageDecodeBench.cpp index 3ce2fb0afe..55dffe9b2e 100644 --- a/bench/ImageDecodeBench.cpp +++ b/bench/ImageDecodeBench.cpp @@ -28,16 +28,16 @@ public: fName.append(SkOSPath::Basename(filename)); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { SkFILEStream fileStream(fFilename.c_str()); fValid = fileStream.isValid() && fileStream.getLength() > 0; if (fValid) { @@ -52,7 +52,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { #ifdef SK_DEBUG if (!fValid) { SkDebugf("stream was invalid: %s\n", fName.c_str()); diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index 680628e0e0..0e5d4d1f83 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -21,11 +21,11 @@ public: ImageFilterDAGBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "image_filter_dag"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 b19af8f35f..c03da4b8cc 100644 --- a/bench/InterpBench.cpp +++ b/bench/InterpBench.cpp @@ -22,7 +22,7 @@ public: fDx = 0.1257f; } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -51,7 +51,7 @@ public: Fixed16D16Interp() : INHERITED("16.16") {} protected: - virtual void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) SK_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: - virtual void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) SK_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: - virtual void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) SK_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: - virtual void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) SK_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: - virtual void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { double ffx = fx; double ddx = dx; SkFixed tmp; diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp index 4d234b951f..ed0c9858ef 100644 --- a/bench/LightingBench.cpp +++ b/bench/LightingBench.cpp @@ -101,11 +101,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingpointlitdiffuse_small" : "lightingpointlitdiffuse_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreatePointLitDiffuse(getPointLocation(), getWhite(), getSurfaceScale(), @@ -122,11 +122,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingdistantlitdiffuse_small" : "lightingdistantlitdiffuse_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitDiffuse(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -143,11 +143,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingspotlitdiffuse_small" : "lightingspotlitdiffuse_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitDiffuse(getSpotLocation(), getSpotTarget(), getSpotExponent(), @@ -167,11 +167,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingpointlitspecular_small" : "lightingpointlitspecular_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreatePointLitSpecular(getPointLocation(), getWhite(), getSurfaceScale(), @@ -189,11 +189,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingdistantlitspecular_small" : "lightingdistantlitspecular_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateDistantLitSpecular(getDistantDirection(), getWhite(), getSurfaceScale(), @@ -211,11 +211,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "lightingspotlitspecular_small" : "lightingspotlitspecular_large"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { draw(loops, canvas, SkLightingImageFilter::CreateSpotLitSpecular(getSpotLocation(), getSpotTarget(), getSpotExponent(), diff --git a/bench/LineBench.cpp b/bench/LineBench.cpp index bb6215b03f..e5065d2dab 100644 --- a/bench/LineBench.cpp +++ b/bench/LineBench.cpp @@ -38,11 +38,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; this->setupPaint(&paint); diff --git a/bench/MagnifierBench.cpp b/bench/MagnifierBench.cpp index c47dcdc947..39bec98e28 100644 --- a/bench/MagnifierBench.cpp +++ b/bench/MagnifierBench.cpp @@ -22,18 +22,18 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "magnifier_small" : "magnifier_large"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInitialized) { make_checkerboard(); fInitialized = true; } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 dbd661f8d3..5b46d1c704 100644 --- a/bench/MathBench.cpp +++ b/bench/MathBench.cpp @@ -31,7 +31,7 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -285,7 +285,7 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -353,7 +353,7 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -414,7 +414,7 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -470,7 +470,7 @@ public: fName = "point_normalize"; } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -517,7 +517,7 @@ public: } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -553,7 +553,7 @@ public: fName.printf("divmod_%s", name); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/Matrix44Bench.cpp b/bench/Matrix44Bench.cpp index 8a7c50e606..3739458b22 100644 --- a/bench/Matrix44Bench.cpp +++ b/bench/Matrix44Bench.cpp @@ -17,7 +17,7 @@ public: fName.printf("matrix44_%s", name); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp index 78482d963d..1a35c2ed92 100644 --- a/bench/MatrixBench.cpp +++ b/bench/MatrixBench.cpp @@ -18,7 +18,7 @@ public: fName.printf("matrix_%s", name); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/MemcpyBench.cpp b/bench/MemcpyBench.cpp index 567320be7c..4778d548d7 100644 --- a/bench/MemcpyBench.cpp +++ b/bench/MemcpyBench.cpp @@ -18,15 +18,15 @@ public: , fMemcpy32(memcpy32) , fName(SkStringPrintf("%s_%d", name, count)) {} - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fDst.reset(fCount); fSrc.reset(fCount); @@ -36,7 +36,7 @@ public: } } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { for (int i = 0; i < loops; i++) { fMemcpy32(fDst, fSrc, fCount); } diff --git a/bench/MemoryBench.cpp b/bench/MemoryBench.cpp index 05ec83b3e0..c2c9a1ae33 100644 --- a/bench/MemoryBench.cpp +++ b/bench/MemoryBench.cpp @@ -21,16 +21,16 @@ public: fName.printf("chunkalloc_" SK_SIZE_T_SPECIFIER, minSize); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 3e0e8cd6db..41b802c36d 100644 --- a/bench/MemsetBench.cpp +++ b/bench/MemsetBench.cpp @@ -35,18 +35,18 @@ public: fName.printf("memset%d_%d_%d", type, minSize, maxSize); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } virtual void performTest() = 0; protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int i = 0; i < loops; ++i) { this->performTest(); } @@ -63,7 +63,7 @@ public: : INHERITED(MEMSET32, minSize, maxSize) {} protected: - virtual void performTest() SK_OVERRIDE { + void performTest() SK_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: - virtual void performTest() SK_OVERRIDE { + void performTest() SK_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 2e1ca32350..1e8069ee0e 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -20,11 +20,11 @@ public: MergeBench(bool small) : fIsSmall(small), fInitialized(false) { } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fIsSmall ? "merge_small" : "merge_large"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { if (!fInitialized) { make_bitmap(); make_checkerboard(); @@ -32,7 +32,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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/MutexBench.cpp b/bench/MutexBench.cpp index 59f054c321..b9d54f190c 100644 --- a/bench/MutexBench.cpp +++ b/bench/MutexBench.cpp @@ -9,7 +9,7 @@ class MutexBench : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/PatchBench.cpp b/bench/PatchBench.cpp index 744141a879..cc9cb84438 100644 --- a/bench/PatchBench.cpp +++ b/bench/PatchBench.cpp @@ -82,7 +82,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { SkString vertexMode; switch (fVertexMode) { case kNone_VertexMode: @@ -107,7 +107,7 @@ protected: return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { this->setCubics(); this->setColors(); this->setTexCoords(); @@ -123,7 +123,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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) { } - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("square"); } - virtual void setCubics() SK_OVERRIDE { + void setCubics() SK_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) { } - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("LOD_Diff"); } - virtual void setCubics() SK_OVERRIDE { + void setCubics() SK_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) { } - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("loop"); } - virtual void setCubics() SK_OVERRIDE { + void setCubics() SK_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 c250781893..0fe12e2f8f 100644 --- a/bench/PatchGridBench.cpp +++ b/bench/PatchGridBench.cpp @@ -163,7 +163,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { SkString vertexMode; switch (fVertexMode) { case kNone_VertexMode: @@ -200,7 +200,7 @@ protected: return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { this->setGrid(); switch (fVertexMode) { case kTexCoords_VertexMode: @@ -214,7 +214,7 @@ protected: this->setupPaint(&fPaint); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 297d36d508..b597f919f8 100644 --- a/bench/PathBench.cpp +++ b/bench/PathBench.cpp @@ -42,7 +42,7 @@ public: virtual int complexity() { return 0; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_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(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint(fPaint); this->setupPaint(&paint); @@ -81,10 +81,10 @@ class TrianglePathBench : public PathBench { public: TrianglePathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("triangle"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_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) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("rect"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRect r = { 10, 10, 20, 20 }; path->addRect(r); } @@ -116,10 +116,10 @@ class OvalPathBench : public PathBench { public: OvalPathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("oval"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRect r = { 10, 10, 23, 20 }; path->addOval(r); } @@ -131,10 +131,10 @@ class CirclePathBench: public PathBench { public: CirclePathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("circle"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { path->addCircle(SkIntToScalar(20), SkIntToScalar(20), SkIntToScalar(10)); } @@ -146,7 +146,7 @@ class SawToothPathBench : public PathBench { public: SawToothPathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("sawtooth"); } virtual void makePath(SkPath* path) { @@ -167,7 +167,7 @@ public: path->lineTo(x0, y + 2 * dy); path->close(); } - virtual int complexity() SK_OVERRIDE { return 1; } + int complexity() SK_OVERRIDE { return 1; } private: typedef PathBench INHERITED; }; @@ -176,10 +176,10 @@ class LongCurvedPathBench : public PathBench { public: LongCurvedPathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("long_curved"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_OVERRIDE { SkRandom rand (12); int i; for (i = 0; i < 100; i++) { @@ -190,7 +190,7 @@ public: } path->close(); } - virtual int complexity() SK_OVERRIDE { return 2; } + int complexity() SK_OVERRIDE { return 2; } private: typedef PathBench INHERITED; }; @@ -199,24 +199,24 @@ class LongLinePathBench : public PathBench { public: LongLinePathBench(Flags flags) : INHERITED(flags) {} - virtual void appendName(SkString* name) SK_OVERRIDE { + void appendName(SkString* name) SK_OVERRIDE { name->append("long_line"); } - virtual void makePath(SkPath* path) SK_OVERRIDE { + void makePath(SkPath* path) SK_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); } } - virtual int complexity() SK_OVERRIDE { return 2; } + int complexity() SK_OVERRIDE { return 2; } private: typedef PathBench INHERITED; }; class RandomPathBench : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -321,15 +321,15 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "path_create"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { this->createData(10, 100); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "path_copy"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { this->createData(10, 100); fPaths.reset(kPathCnt); fCopies.reset(kPathCnt); @@ -363,7 +363,7 @@ protected: } this->finishedMakingPaths(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fInPlace ? "path_transform_in_place" : "path_transform_copy"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fMatrix.setScale(5 * SK_Scalar1, 6 * SK_Scalar1); this->createData(10, 100); fPaths.reset(kPathCnt); @@ -403,7 +403,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { if (fInPlace) { for (int i = 0; i < loops; ++i) { fPaths[i & (kPathCnt - 1)].transform(fMatrix); @@ -434,11 +434,11 @@ public: PathEqualityBench() { } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "path_equality_50%"; } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fParity = 0; this->createData(10, 100); fPaths.reset(kPathCnt); @@ -450,7 +450,7 @@ protected: this->finishedMakingPaths(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { switch (fType) { case kAdd_AddType: return "path_add_path"; @@ -501,7 +501,7 @@ protected: } } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { // reversePathTo assumes a single contour path. bool allowMoves = kReversePathTo_AddType != fType; this->createData(10, 100, allowMoves); @@ -514,7 +514,7 @@ protected: this->finishedMakingPaths(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { switch (fType) { case kAdd_AddType: for (int i = 0; i < loops; ++i) { @@ -578,11 +578,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setColor(SK_ColorBLACK); @@ -642,7 +642,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } @@ -688,7 +688,7 @@ protected: SkASSERT(path->isConvex()); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRandom rand; SkRect r; @@ -753,23 +753,23 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } private: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { for (int i = 0; i < loops; ++i) { const SkRect& rect = fQueryRects[i % kQueryRectCnt]; fParity = fParity != fPath.conservativelyContainsRect(rect); } } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fQueryRects.setCount(kQueryRectCnt); SkRandom rand; @@ -817,11 +817,11 @@ public: } private: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "ratquad-chop-0.5"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { SkConic dst[2]; for (int i = 0; i < loops; ++i) { fRQ.chopAt(0.5f, dst); @@ -842,11 +842,11 @@ public: } private: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "ratquad-chop-half"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { SkConic dst[2]; for (int i = 0; i < loops; ++i) { fRQ.chop(dst); @@ -878,7 +878,7 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -897,11 +897,11 @@ public: ConicBench_ComputeError() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "conic-compute-error"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { SkVector err; for (int i = 0; i < loops; ++i) { for (int j = 0; j < CONICS; ++j) { @@ -919,11 +919,11 @@ public: ConicBench_asQuadTol() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "conic-asQuadTol"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { for (int i = 0; i < loops; ++i) { for (int j = 0; j < CONICS; ++j) { fConics[j].asQuadTol(SK_ScalarHalf); @@ -940,11 +940,11 @@ public: ConicBench_quadPow2() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "conic-quadPow2"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 b82146d1b2..c7a04bdd79 100644 --- a/bench/PathIterBench.cpp +++ b/bench/PathIterBench.cpp @@ -56,16 +56,16 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 560628f4fd..17260a9cb8 100644 --- a/bench/PerlinNoiseBench.cpp +++ b/bench/PerlinNoiseBench.cpp @@ -17,11 +17,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "perlinnoise"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 a3193e61aa..b2220b7ed4 100644 --- a/bench/PictureNestingBench.cpp +++ b/bench/PictureNestingBench.cpp @@ -26,7 +26,7 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } @@ -139,7 +139,7 @@ public: : INHERITED("playback", maxLevel, maxPictureLevel) { } protected: - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { this->INHERITED::onPreDraw(); SkIPoint canvasSize = onGetSize(); diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp index 1701d140d5..67945ce001 100644 --- a/bench/PicturePlaybackBench.cpp +++ b/bench/PicturePlaybackBench.cpp @@ -72,7 +72,7 @@ class TextPlaybackBench : public PicturePlaybackBench { public: TextPlaybackBench() : INHERITED("drawText") { } protected: - virtual void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { + void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setTextSize(fTextSize); paint.setColor(SK_ColorBLACK); @@ -97,7 +97,7 @@ public: : INHERITED(drawPosH ? "drawPosTextH" : "drawPosText") , fDrawPosH(drawPosH) { } protected: - virtual void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { + void recordCanvas(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setTextSize(fTextSize); paint.setColor(SK_ColorBLACK); @@ -159,10 +159,10 @@ public: } } - virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(1024,1024); } + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + SkIPoint onGetSize() SK_OVERRIDE { return SkIPoint::Make(1024,1024); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { SkAutoTDelete<SkBBHFactory> factory; switch (fBBH) { case kNone: break; @@ -185,7 +185,7 @@ public: fPic.reset(recorder.endRecording()); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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 32f749c366..4d9dbcd623 100644 --- a/bench/PremulAndUnpremulAlphaOpsBench.cpp +++ b/bench/PremulAndUnpremulAlphaOpsBench.cpp @@ -25,11 +25,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_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() } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { canvas->clear(SK_ColorBLACK); for (int loop = 0; loop < loops; ++loop) { diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp index 93576a7fcf..39c2aa116c 100644 --- a/bench/RTreeBench.cpp +++ b/bench/RTreeBench.cpp @@ -26,15 +26,15 @@ public: fName.printf("rtree_%s_build", name); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_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); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_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, NUM_QUERY_RECTS); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRandom rand; for (int i = 0; i < loops; ++i) { SkTDArray<unsigned> hits; diff --git a/bench/ReadPixBench.cpp b/bench/ReadPixBench.cpp index 7848ebc757..f019401ea3 100644 --- a/bench/ReadPixBench.cpp +++ b/bench/ReadPixBench.cpp @@ -20,11 +20,11 @@ public: ReadPixBench() {} protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "readpix"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { canvas->clear(SK_ColorBLACK); SkISize size = canvas->getDeviceSize(); diff --git a/bench/RecordingBench.h b/bench/RecordingBench.h index 4c0340127c..783596d827 100644 --- a/bench/RecordingBench.h +++ b/bench/RecordingBench.h @@ -16,10 +16,10 @@ public: RecordingBench(const char* name, const SkPicture*, bool useBBH); protected: - virtual const char* onGetName() SK_OVERRIDE; - virtual bool isSuitableFor(Backend) SK_OVERRIDE; - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE; - virtual SkIPoint onGetSize() SK_OVERRIDE; + const char* onGetName() SK_OVERRIDE; + bool isSuitableFor(Backend) SK_OVERRIDE; + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE; + SkIPoint onGetSize() SK_OVERRIDE; private: SkAutoTUnref<const SkPicture> fSrc; diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp index c0201dca4b..6228e00a57 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -92,14 +92,14 @@ public: } protected: - virtual void setupPaint(SkPaint* paint) SK_OVERRIDE { + void setupPaint(SkPaint* paint) SK_OVERRIDE { this->INHERITED::setupPaint(paint); // srcmode is most interesting when we're not opaque paint->setAlpha(0x80); paint->setXfermode(fMode); } - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { fName.set(this->INHERITED::onGetName()); fName.prepend("srcmode_"); return fName.c_str(); diff --git a/bench/RectanizerBench.cpp b/bench/RectanizerBench.cpp index 286b681d38..a5fad06366 100644 --- a/bench/RectanizerBench.cpp +++ b/bench/RectanizerBench.cpp @@ -64,15 +64,15 @@ public: } protected: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return kNonRendering_Backend == backend; } - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { SkASSERT(NULL == fRectanizer.get()); if (kPow2_RectanizerType == fRectanizerType) { @@ -83,7 +83,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRandom rand; SkIPoint16 loc; SkISize size; diff --git a/bench/RectoriBench.cpp b/bench/RectoriBench.cpp index ab9bdd598c..de725a7cb2 100644 --- a/bench/RectoriBench.cpp +++ b/bench/RectoriBench.cpp @@ -20,11 +20,11 @@ public: protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "rectori"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRandom Random; for (int i = 0; i < loops; i++) { diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp index d440d99db2..7aa5746318 100644 --- a/bench/RefCntBench.cpp +++ b/bench/RefCntBench.cpp @@ -18,7 +18,7 @@ class AtomicInc32 : public Benchmark { public: AtomicInc32() : fX(0) {} - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -42,7 +42,7 @@ class AtomicInc64 : public Benchmark { public: AtomicInc64() : fX(0) {} - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -64,7 +64,7 @@ private: class RefCntBench_Stack : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -100,7 +100,7 @@ private: class RefCntBench_Heap : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -127,7 +127,7 @@ private: class RefCntBench_New : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -155,7 +155,7 @@ private: class WeakRefCntBench_Stack : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -186,16 +186,16 @@ public: class WeakRefCntBench_Heap : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "ref_cnt_heap_weak"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "ref_cnt_new_weak"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 91ab286923..5cd6779cb7 100644 --- a/bench/RegionBench.cpp +++ b/bench/RegionBench.cpp @@ -99,7 +99,7 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } diff --git a/bench/RegionContainBench.cpp b/bench/RegionContainBench.cpp index f6d8142846..3a0980907a 100644 --- a/bench/RegionContainBench.cpp +++ b/bench/RegionContainBench.cpp @@ -45,14 +45,14 @@ public: fB.setRect(0, 0, H, W); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { Proc proc = fProc; for (int i = 0; i < loops; ++i) { diff --git a/bench/RepeatTileBench.cpp b/bench/RepeatTileBench.cpp index cf147d8c21..0e63336a0f 100644 --- a/bench/RepeatTileBench.cpp +++ b/bench/RepeatTileBench.cpp @@ -104,11 +104,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fBitmap.allocPixels(); fBitmap.eraseColor(kOpaque_SkAlphaType == fAlphaType ? SK_ColorWHITE : 0); @@ -127,7 +127,7 @@ protected: } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint(fPaint); this->setupPaint(&paint); diff --git a/bench/RotatedRectBench.cpp b/bench/RotatedRectBench.cpp index ea8654a344..87b4ec8bd4 100644 --- a/bench/RotatedRectBench.cpp +++ b/bench/RotatedRectBench.cpp @@ -75,9 +75,9 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(fAA); paint.setXfermodeMode(fMode); diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp index 92608123ee..21f9264e9c 100644 --- a/bench/ScalarBench.cpp +++ b/bench/ScalarBench.cpp @@ -18,7 +18,7 @@ public: fName.printf("scalar_%s", name); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } @@ -27,11 +27,11 @@ public: protected: virtual int mulLoopCount() const { return 1; } - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int i = 0; i < loops; i++) { this->performTest(); } @@ -101,8 +101,8 @@ public: } } protected: - virtual int mulLoopCount() const SK_OVERRIDE { return 1; } - virtual void performTest() SK_OVERRIDE { + int mulLoopCount() const SK_OVERRIDE { return 1; } + void performTest() SK_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: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "rect_bounds"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkRect r; for (int i = 0; i < loops; ++i) { r.set(fPts, PTS); diff --git a/bench/SkipZeroesBench.cpp b/bench/SkipZeroesBench.cpp index 5d18264ea1..1587e01f11 100644 --- a/bench/SkipZeroesBench.cpp +++ b/bench/SkipZeroesBench.cpp @@ -36,16 +36,16 @@ public: } } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { SkString resourcePath = GetResourcePath(); if (resourcePath.isEmpty()) { fValid = false; @@ -73,7 +73,7 @@ protected: } } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 a7e8c2cd0b..b46b805890 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); } - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } // Delayed initialization only done if onDraw will be called. - virtual void onPreDraw() SK_OVERRIDE { + void onPreDraw() SK_OVERRIDE { fUnsorted.reset(N); gRec[fType].fProc(fUnsorted.get()); } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 88b2e62ca5..3353ba2b8d 100644 --- a/bench/WritePixelsBench.cpp +++ b/bench/WritePixelsBench.cpp @@ -41,11 +41,11 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkISize size = canvas->getDeviceSize(); canvas->clear(0xFFFF0000); diff --git a/bench/WriterBench.cpp b/bench/WriterBench.cpp index 906a9d2ee8..4dcd3a3d07 100644 --- a/bench/WriterBench.cpp +++ b/bench/WriterBench.cpp @@ -12,16 +12,16 @@ class WriterBench : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { + const char* onGetName() SK_OVERRIDE { return "writer"; } - virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas*) SK_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 54272daf9b..4afd06b261 100644 --- a/bench/XfermodeBench.cpp +++ b/bench/XfermodeBench.cpp @@ -29,9 +29,9 @@ public: } protected: - virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); } + const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { SkISize size = canvas->getDeviceSize(); SkRandom random; for (int i = 0; i < loops; ++i) { @@ -63,14 +63,14 @@ private: class XferCreateBench : public Benchmark { public: - virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) SK_OVERRIDE { return backend == kNonRendering_Backend; } protected: - virtual const char* onGetName() SK_OVERRIDE { return "xfermode_create"; } + const char* onGetName() SK_OVERRIDE { return "xfermode_create"; } - virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { for (int outer = 0; outer < loops * 10; ++outer) { for (int i = 0; i <= SkXfermode::kLastMode; ++i) { SkXfermode* xfer = SkXfermode::Create(SkXfermode::Mode(i)); diff --git a/dm/DMCpuGMTask.h b/dm/DMCpuGMTask.h index 301cfd3864..8258f69e2e 100644 --- a/dm/DMCpuGMTask.h +++ b/dm/DMCpuGMTask.h @@ -22,9 +22,9 @@ public: skiagm::GMRegistry::Factory, SkColorType); - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; + SkString name() const SK_OVERRIDE { return fName; } private: skiagm::GMRegistry::Factory fGMFactory; diff --git a/dm/DMGpuGMTask.h b/dm/DMGpuGMTask.h index 553436d040..87436d39f5 100644 --- a/dm/DMGpuGMTask.h +++ b/dm/DMGpuGMTask.h @@ -25,9 +25,9 @@ public: int sampleCount, bool useDFText); - virtual void draw(GrContextFactory*) SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw(GrContextFactory*) SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; + SkString name() const SK_OVERRIDE { return fName; } private: SkAutoTDelete<skiagm::GM> fGM; diff --git a/dm/DMPDFRasterizeTask.h b/dm/DMPDFRasterizeTask.h index 72319503c7..8148499061 100644 --- a/dm/DMPDFRasterizeTask.h +++ b/dm/DMPDFRasterizeTask.h @@ -26,9 +26,9 @@ public: SkStreamAsset* pdf, RasterizePdfProc); - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE { return NULL == fRasterize; } - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE { return NULL == fRasterize; } + SkString name() const SK_OVERRIDE { return fName; } private: const SkString fName; diff --git a/dm/DMPDFTask.h b/dm/DMPDFTask.h index 72c023282a..8c3ba1dd12 100644 --- a/dm/DMPDFTask.h +++ b/dm/DMPDFTask.h @@ -27,11 +27,11 @@ public: SkString name, RasterizePdfProc); - virtual void draw() SK_OVERRIDE; + void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE { return fName; } + SkString name() const SK_OVERRIDE { return fName; } private: // One of these two will be set. diff --git a/dm/DMPipeTask.h b/dm/DMPipeTask.h index bca74e0b0c..b0c8ea716a 100644 --- a/dm/DMPipeTask.h +++ b/dm/DMPipeTask.h @@ -25,9 +25,9 @@ public: SkBitmap reference, // Bitmap to compare pipe results to. Mode); - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; + SkString name() const SK_OVERRIDE { return fName; } private: const uint32_t fFlags; diff --git a/dm/DMQuiltTask.h b/dm/DMQuiltTask.h index 1b093e68b7..ae45e5cd95 100644 --- a/dm/DMQuiltTask.h +++ b/dm/DMQuiltTask.h @@ -23,9 +23,9 @@ public: SkBitmap reference, // Bitmap to compare picture replay results to. BBH); - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; + SkString name() const SK_OVERRIDE { return fName; } private: const BBH fBBH; diff --git a/dm/DMSKPTask.h b/dm/DMSKPTask.h index b8a288e037..2d830e022b 100644 --- a/dm/DMSKPTask.h +++ b/dm/DMSKPTask.h @@ -16,9 +16,9 @@ class SKPTask : public CpuTask { public: SKPTask(Reporter*, TaskRunner*, const SkPicture*, SkString name); - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE { return false; } - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE { return false; } + SkString name() const SK_OVERRIDE { return fName; } private: SkAutoTUnref<const SkPicture> fPicture; diff --git a/dm/DMSerializeTask.h b/dm/DMSerializeTask.h index c840d278fa..16025c2c3e 100644 --- a/dm/DMSerializeTask.h +++ b/dm/DMSerializeTask.h @@ -16,9 +16,9 @@ class SerializeTask : public CpuTask { public: SerializeTask(const Task& parent, skiagm::GM*, SkBitmap reference); - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; + SkString name() const SK_OVERRIDE { return fName; } private: const SkString fName; diff --git a/dm/DMTestTask.h b/dm/DMTestTask.h index 2ca31e38b5..4be57a9f86 100644 --- a/dm/DMTestTask.h +++ b/dm/DMTestTask.h @@ -19,10 +19,10 @@ public: const SkTArray<SkString>& failures() const { return fFailures; } private: - virtual bool allowExtendedTest() const SK_OVERRIDE; - virtual bool verbose() const SK_OVERRIDE; + bool allowExtendedTest() const SK_OVERRIDE; + bool verbose() const SK_OVERRIDE; - virtual void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE { + void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE { JsonWriter::AddTestFailure(failure); SkString newFailure; @@ -37,9 +37,9 @@ class CpuTestTask : public CpuTask { public: CpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory); - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE { return false; } - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE { return false; } + SkString name() const SK_OVERRIDE { return fName; } private: TestReporter fTestReporter; @@ -51,9 +51,9 @@ class GpuTestTask : public GpuTask { public: GpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory); - virtual void draw(GrContextFactory*) SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE { return fName; } + void draw(GrContextFactory*) SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; + SkString name() const SK_OVERRIDE { return fName; } private: TestReporter fTestReporter; diff --git a/dm/DMWriteTask.h b/dm/DMWriteTask.h index c6ef1cb20b..fb80058fd0 100644 --- a/dm/DMWriteTask.h +++ b/dm/DMWriteTask.h @@ -25,9 +25,9 @@ public: SkStreamAsset* data, // Pre-encoded data to write to disk. const char* ext); // File extension. - virtual void draw() SK_OVERRIDE; - virtual bool shouldSkip() const SK_OVERRIDE; - virtual SkString name() const SK_OVERRIDE; + void draw() SK_OVERRIDE; + bool shouldSkip() const SK_OVERRIDE; + SkString name() const SK_OVERRIDE; private: SkTArray<SkString> fSuffixes; diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h index 5839ad32f8..58c239a053 100644 --- a/experimental/PdfViewer/SkNulCanvas.h +++ b/experimental/PdfViewer/SkNulCanvas.h @@ -26,13 +26,13 @@ public: explicit SkNulCanvas(const SkBitmap& bitmap) : SkCanvas(bitmap) {} virtual ~SkNulCanvas() {} - virtual void beginCommentGroup(const char* description) SK_OVERRIDE {} - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE {} - virtual void endCommentGroup() SK_OVERRIDE {} - virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE {return NULL;} + void beginCommentGroup(const char* description) SK_OVERRIDE {} + void addComment(const char* kywd, const char* value) SK_OVERRIDE {} + void endCommentGroup() SK_OVERRIDE {} + SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE {return NULL;} - virtual bool isClipEmpty() const SK_OVERRIDE { return false; } - virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { + bool isClipEmpty() const SK_OVERRIDE { return false; } + bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { if (NULL != bounds) { bounds->setXYWH(0, 0, SkIntToScalar(this->imageInfo().width()), @@ -40,7 +40,7 @@ public: } return true; } - virtual bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE { + bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE { if (NULL != bounds) { bounds->setLargest(); } @@ -68,12 +68,12 @@ protected: const SkPath& path, const SkMatrix* matrix, const SkPaint& paint) SK_OVERRIDE {} - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE {} + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE {} - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE {} + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE {} void onDrawPaint(const SkPaint& paint) SK_OVERRIDE {} void onDrawPoints(PointMode mode, size_t count, const SkPoint pts[], diff --git a/experimental/PdfViewer/src/SkPdfContext.cpp b/experimental/PdfViewer/src/SkPdfContext.cpp index 670e6ce48d..038d38e84e 100644 --- a/experimental/PdfViewer/src/SkPdfContext.cpp +++ b/experimental/PdfViewer/src/SkPdfContext.cpp @@ -19,8 +19,8 @@ public: SkCanvas* canvas) : INHERITED(tokenizer, pdfContext, canvas) {} - virtual SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE; - virtual void loop() SK_OVERRIDE; + SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE; + void loop() SK_OVERRIDE; private: typedef SkPdfTokenLooper INHERITED; diff --git a/experimental/PdfViewer/src/SkPdfRenderer.cpp b/experimental/PdfViewer/src/SkPdfRenderer.cpp index 35e6e060ad..037606694e 100644 --- a/experimental/PdfViewer/src/SkPdfRenderer.cpp +++ b/experimental/PdfViewer/src/SkPdfRenderer.cpp @@ -212,8 +212,8 @@ public: explicit PdfInlineImageLooper(SkPdfTokenLooper* parent) : INHERITED(parent) {} - virtual SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE; - virtual void loop() SK_OVERRIDE; + SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE; + void loop() SK_OVERRIDE; private: typedef SkPdfTokenLooper INHERITED; @@ -224,8 +224,8 @@ public: explicit PdfCompatibilitySectionLooper(SkPdfTokenLooper* parent) : INHERITED (parent) {} - virtual SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE; - virtual void loop() SK_OVERRIDE; + SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE; + void loop() SK_OVERRIDE; private: typedef SkPdfTokenLooper INHERITED; diff --git a/experimental/SkV8Example/SkV8Example.h b/experimental/SkV8Example/SkV8Example.h index c111a48006..38a9c8561a 100644 --- a/experimental/SkV8Example/SkV8Example.h +++ b/experimental/SkV8Example/SkV8Example.h @@ -25,15 +25,15 @@ public: virtual ~SkV8ExampleWindow(); protected: - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE; - virtual void onSizeChange() SK_OVERRIDE; + void onDraw(SkCanvas* canvas) SK_OVERRIDE; + void onSizeChange() SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual SkSurface* createSurface() SK_OVERRIDE; + SkSurface* createSurface() SK_OVERRIDE; #endif #ifdef SK_BUILD_FOR_WIN - virtual void onHandleInval(const SkIRect&) SK_OVERRIDE; + void onHandleInval(const SkIRect&) SK_OVERRIDE; #endif void windowSizeChanged(); diff --git a/experimental/SkiaExamples/SkExample.h b/experimental/SkiaExamples/SkExample.h index ea734dcdc6..ee9e36e0d0 100644 --- a/experimental/SkiaExamples/SkExample.h +++ b/experimental/SkiaExamples/SkExample.h @@ -52,12 +52,12 @@ public: DeviceType getDeviceType() const { return fType; } protected: - virtual void draw(SkCanvas* canvas) SK_OVERRIDE; + void draw(SkCanvas* canvas) SK_OVERRIDE; - virtual void onSizeChange() SK_OVERRIDE; + void onSizeChange() SK_OVERRIDE; #ifdef SK_BUILD_FOR_WIN - virtual void onHandleInval(const SkIRect&) SK_OVERRIDE; + void onHandleInval(const SkIRect&) SK_OVERRIDE; #endif SkCanvas* createCanvas() SK_OVERRIDE; diff --git a/experimental/iOSSampleApp/SkSampleUIView.mm b/experimental/iOSSampleApp/SkSampleUIView.mm index 41bf91d4e9..6234739e07 100644 --- a/experimental/iOSSampleApp/SkSampleUIView.mm +++ b/experimental/iOSSampleApp/SkSampleUIView.mm @@ -40,7 +40,7 @@ public: #endif } - virtual void setUpBackend(SampleWindow* win, int msaaSampleCount) SK_OVERRIDE { + void setUpBackend(SampleWindow* win, int msaaSampleCount) SK_OVERRIDE { SkASSERT(SkOSWindow::kNone_BackEndType == fBackend); fBackend = SkOSWindow::kNone_BackEndType; @@ -105,7 +105,7 @@ public: this->windowSizeChanged(win); } - virtual void tearDownBackend(SampleWindow *win) SK_OVERRIDE { + void tearDownBackend(SampleWindow *win) SK_OVERRIDE { #if SK_SUPPORT_GPU SkSafeUnref(fCurContext); fCurContext = NULL; @@ -120,7 +120,7 @@ public: fBackend = SampleWindow::kNone_BackEndType; } - virtual SkSurface* createSurface(SampleWindow::DeviceType dType, SampleWindow* win) SK_OVERRIDE{ + SkSurface* createSurface(SampleWindow::DeviceType dType, SampleWindow* win) SK_OVERRIDE{ #if SK_SUPPORT_GPU if (SampleWindow::IsGpuDeviceType(dType) && fCurContext) { SkSurfaceProps props(win->getSurfaceProps()); @@ -141,7 +141,7 @@ public: win->present(); } - virtual void windowSizeChanged(SampleWindow* win) SK_OVERRIDE { + void windowSizeChanged(SampleWindow* win) SK_OVERRIDE { #if SK_SUPPORT_GPU if (NULL != fCurContext) { SkOSWindow::AttachmentInfo info; @@ -163,7 +163,7 @@ public: #endif } - virtual GrContext* getGrContext() SK_OVERRIDE { + GrContext* getGrContext() SK_OVERRIDE { #if SK_SUPPORT_GPU return fCurContext; #else @@ -171,7 +171,7 @@ public: #endif } - virtual GrRenderTarget* getGrRenderTarget() SK_OVERRIDE { + GrRenderTarget* getGrRenderTarget() SK_OVERRIDE { #if SK_SUPPORT_GPU return fCurRenderTarget; #else diff --git a/experimental/tools/PageCachingDocument.cpp b/experimental/tools/PageCachingDocument.cpp index 38e883e839..7822d55e9e 100644 --- a/experimental/tools/PageCachingDocument.cpp +++ b/experimental/tools/PageCachingDocument.cpp @@ -26,9 +26,9 @@ public: virtual SkCanvas* onBeginPage(SkScalar width, SkScalar height, const SkRect& content) SK_OVERRIDE; - virtual void onEndPage() SK_OVERRIDE; - virtual bool onClose(SkWStream*) SK_OVERRIDE; - virtual void onAbort() SK_OVERRIDE; + void onEndPage() SK_OVERRIDE; + bool onClose(SkWStream*) SK_OVERRIDE; + void onAbort() SK_OVERRIDE; private: struct Page { diff --git a/experimental/tools/multipage_pdf_profiler.cpp b/experimental/tools/multipage_pdf_profiler.cpp index 4f8eae2fb6..337db1f91a 100644 --- a/experimental/tools/multipage_pdf_profiler.cpp +++ b/experimental/tools/multipage_pdf_profiler.cpp @@ -31,11 +31,11 @@ class NullWStream : public SkWStream { public: NullWStream() : fBytesWritten(0) { } - virtual bool write(const void*, size_t size) SK_OVERRIDE { + bool write(const void*, size_t size) SK_OVERRIDE { fBytesWritten += size; return true; } - virtual size_t bytesWritten() const SK_OVERRIDE { + size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } size_t fBytesWritten; diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp index e7f7f7a42e..6ac9f0b17b 100644 --- a/gm/aaclip.cpp +++ b/gm/aaclip.cpp @@ -71,15 +71,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("aaclip"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(240, 120); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // Initial pixel-boundary-aligned draw draw_rect_tests(canvas); @@ -101,7 +101,7 @@ protected: draw_rect_tests(canvas); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } private: typedef skiagm::GM INHERITED; @@ -156,15 +156,15 @@ public: CGImageGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("cgimage"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 250); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const struct { SkColorType fCT; SkAlphaType fAT; @@ -187,7 +187,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } private: typedef skiagm::GM INHERITED; diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp index 041ae198a1..3c9a6831ae 100644 --- a/gm/aarectmodes.cpp +++ b/gm/aarectmodes.cpp @@ -133,17 +133,17 @@ namespace skiagm { } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("aarectmodes"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (false) { // avoid bit rot, suppress warning test4(canvas); } diff --git a/gm/alphagradients.cpp b/gm/alphagradients.cpp index 1175911756..4fd11ad206 100644 --- a/gm/alphagradients.cpp +++ b/gm/alphagradients.cpp @@ -14,11 +14,11 @@ public: AlphaGradientsGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("alphagradients"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } @@ -38,7 +38,7 @@ protected: canvas->drawRect(r, paint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const struct { SkColor fColor0; SkColor fColor1; @@ -72,7 +72,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } private: typedef skiagm::GM INHERITED; diff --git a/gm/arcofzorro.cpp b/gm/arcofzorro.cpp index 2e5dff8e7e..7748f34dd8 100644 --- a/gm/arcofzorro.cpp +++ b/gm/arcofzorro.cpp @@ -20,19 +20,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("arcofzorro"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1000, 1000); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRandom rand; SkRect rect = SkRect::MakeXYWH(10, 10, 200, 200); diff --git a/gm/astcbitmap.cpp b/gm/astcbitmap.cpp index b415a82a66..808b23e3f2 100644 --- a/gm/astcbitmap.cpp +++ b/gm/astcbitmap.cpp @@ -53,15 +53,15 @@ public: virtual ~ASTCBitmapGM() { } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("astcbitmap"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kGMDimension, kGMDimension); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { for (int j = 0; j < 4; ++j) { for (int i = 0; i < 4; ++i) { SkString filename = GetResourcePath(get_astc_filename(j*4+i)); diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index dd15aedfb2..b25ba7e723 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -36,21 +36,21 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bezier_cubic_effects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 800); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // This is a GPU-specific GM. return kGPUOnly_Flag; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); if (NULL == rt) { return; @@ -195,21 +195,21 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bezier_conic_effects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 800); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // This is a GPU-specific GM. return kGPUOnly_Flag; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); if (NULL == rt) { return; @@ -387,21 +387,21 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bezier_quad_effects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 800); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // This is a GPU-specific GM. return kGPUOnly_Flag; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); if (NULL == rt) { return; diff --git a/gm/beziers.cpp b/gm/beziers.cpp index 4fac17b6c8..a35f2a6046 100755 --- a/gm/beziers.cpp +++ b/gm/beziers.cpp @@ -46,19 +46,19 @@ public: BeziersGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("beziers"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(W, H*2); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(SkIntToScalar(9)/2); diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp index 105bd452d9..39713c5a71 100644 --- a/gm/bigblurs.cpp +++ b/gm/bigblurs.cpp @@ -23,15 +23,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bigblurs"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, kHeight); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const int kBig = 65536; static const SkScalar kSigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4)); diff --git a/gm/bigtext.cpp b/gm/bigtext.cpp index eabad14d0c..bdb31769ca 100644 --- a/gm/bigtext.cpp +++ b/gm/bigtext.cpp @@ -19,19 +19,19 @@ public: BigTextGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bigtext"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); sk_tool_utils::set_portable_typeface(&paint); diff --git a/gm/bitmappremul.cpp b/gm/bitmappremul.cpp index e315fafdde..975dd67ae1 100644 --- a/gm/bitmappremul.cpp +++ b/gm/bitmappremul.cpp @@ -113,11 +113,11 @@ protected: return SkString("bitmap_premul"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(SLIDE_SIZE * 2, SLIDE_SIZE * 2); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar slideSize = SkIntToScalar(SLIDE_SIZE); canvas->drawBitmap(make_argb8888_gradient(), 0, 0); canvas->drawBitmap(make_argb4444_gradient(), slideSize, 0); diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp index df30106c7c..ae505bf00d 100644 --- a/gm/bitmaprect.cpp +++ b/gm/bitmaprect.cpp @@ -35,24 +35,24 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString str; str.printf("bitmaprect_%s", fUseIRect ? "i" : "s"); return str; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } #ifdef SK_CPU_ARM64 // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } #endif - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(0xFFCCCCCC); const SkIRect src[] = { @@ -128,17 +128,17 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString str; str.printf("3x3bitmaprect"); return str; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkBitmap bitmap; make_3x3_bitmap(&bitmap); @@ -187,21 +187,21 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString str; str.printf("bigbitmaprect_%s", fUseIRect ? "i" : "s"); return str; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { make_big_bitmap(&fBigBitmap); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkXfermode* mode = SkXfermode::Create(SkXfermode::kXor_Mode); diff --git a/gm/bitmaprecttest.cpp b/gm/bitmaprecttest.cpp index 22962cbb1f..dba63744fc 100644 --- a/gm/bitmaprecttest.cpp +++ b/gm/bitmaprecttest.cpp @@ -56,15 +56,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bitmaprecttest"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(320, 240); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { test_bitmaprect(canvas); } diff --git a/gm/bitmapscroll.cpp b/gm/bitmapscroll.cpp index dff5226a2d..d5c3051172 100644 --- a/gm/bitmapscroll.cpp +++ b/gm/bitmapscroll.cpp @@ -59,19 +59,19 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bitmapscroll"); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->init(); SkIRect scrollCenterRegion = SkIRect::MakeXYWH( quarterWidth, quarterHeight, quarterWidth*2+1, quarterHeight*2+1); diff --git a/gm/bitmapsource.cpp b/gm/bitmapsource.cpp index f6badde89e..1c35a0bdc9 100644 --- a/gm/bitmapsource.cpp +++ b/gm/bitmapsource.cpp @@ -17,7 +17,7 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bitmapsource"); } @@ -34,9 +34,9 @@ protected: canvas.drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(500, 150); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(500, 150); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { this->makeBitmap(); } @@ -49,7 +49,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->clear(0x00000000); { SkRect srcRect = SkRect::MakeXYWH(20, 20, 30, 30); diff --git a/gm/bleed.cpp b/gm/bleed.cpp index aa2b0df8c4..e361926d70 100644 --- a/gm/bleed.cpp +++ b/gm/bleed.cpp @@ -85,19 +85,19 @@ public: BleedGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("bleed"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, 780); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { make_ringed_bitmap(&fBitmapSmall, kSmallTextureSize, kSmallTextureSize); // To exercise the GPU's tiling path we need a texture @@ -176,7 +176,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->clear(SK_ColorGRAY); diff --git a/gm/blurcircles.cpp b/gm/blurcircles.cpp index 44f4d6d072..0e7f916d40 100644 --- a/gm/blurcircles.cpp +++ b/gm/blurcircles.cpp @@ -19,19 +19,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(950, 950); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->scale(1.5f, 1.5f); canvas->translate(50,50); diff --git a/gm/blurquickreject.cpp b/gm/blurquickreject.cpp index ae5b6893eb..7c74fdf380 100644 --- a/gm/blurquickreject.cpp +++ b/gm/blurquickreject.cpp @@ -22,15 +22,15 @@ public: BlurQuickRejectGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("blurquickreject"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, kHeight); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const SkScalar kBlurRadius = SkIntToScalar(20); static const SkScalar kBoxSize = SkIntToScalar(100); diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index 61e18bdbb1..a47b9cdc14 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -93,7 +93,7 @@ public: } protected: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { for (int i = 0; i <= kLastEnum_SkBlurStyle; ++i) { fMaskFilters[i].reset(SkBlurMaskFilter::Create((SkBlurStyle)i, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(STROKE_WIDTH/2)), @@ -101,15 +101,15 @@ protected: } } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(860, 820); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(STROKE_WIDTH*3/2, STROKE_WIDTH*3/2); SkRect r = { 0, 0, 100, 50 }; @@ -147,7 +147,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag | kSkipTiled_Flag; } private: void drawProcs(SkCanvas* canvas, const SkRect& r, const SkPaint& paint, @@ -335,7 +335,7 @@ public: } protected: - virtual bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { + bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { return SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), m, r, this->style()); } @@ -351,7 +351,7 @@ public: } protected: - virtual bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { + bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { SkMask src; r.roundOut(&src.fBounds); src.fBounds.offset(-src.fBounds.fLeft, -src.fBounds.fTop); // move to origin @@ -382,7 +382,7 @@ public: } protected: - virtual SkBlurQuality getQuality() SK_OVERRIDE { + SkBlurQuality getQuality() SK_OVERRIDE { return kLow_SkBlurQuality; } private: @@ -397,7 +397,7 @@ public: } protected: - virtual bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { + bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { SkMask src; r.roundOut(&src.fBounds); src.fBounds.offset(-src.fBounds.fLeft, -src.fBounds.fTop); // move to origin diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index 1819ac2edd..c8468fe83e 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -42,16 +42,16 @@ public: fRRect.setRectRadii(r, radii); } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(SkScalarCeilToInt(fRRect.rect().width()), SkScalarCeilToInt(fRRect.rect().height())); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkLayerDrawLooper::Builder looperBuilder; { SkLayerDrawLooper::LayerInfo info; @@ -126,19 +126,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1000, 500); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->scale(1.5f, 1.5f); canvas->translate(50,50); diff --git a/gm/blurs.cpp b/gm/blurs.cpp index dfa95ce397..d5bb7d2415 100644 --- a/gm/blurs.cpp +++ b/gm/blurs.cpp @@ -16,19 +16,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("blurs"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 500); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkBlurStyle NONE = SkBlurStyle(-999); static const struct { SkBlurStyle fStyle; diff --git a/gm/circles.cpp b/gm/circles.cpp index 6fa682c266..b513ccba7b 100644 --- a/gm/circles.cpp +++ b/gm/circles.cpp @@ -25,15 +25,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("circles"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 900); } @@ -155,7 +155,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // Draw a giant AA circle as the background. SkISize size = this->getISize(); SkScalar giantRadius = SkTMin(SkIntToScalar(size.fWidth), diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp index 81803a3e78..6a8415c67e 100644 --- a/gm/circularclips.cpp +++ b/gm/circularclips.cpp @@ -25,19 +25,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag | kAsBench_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("circular-clips"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRegion::Op ops[] = { SkRegion::kDifference_Op, SkRegion::kIntersect_Op, diff --git a/gm/clip_strokerect.cpp b/gm/clip_strokerect.cpp index da79ed828b..f7c18e73e6 100644 --- a/gm/clip_strokerect.cpp +++ b/gm/clip_strokerect.cpp @@ -16,15 +16,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("clip_strokerect"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(200, 400); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint p; p.setColor(SK_ColorRED); p.setAntiAlias(true); @@ -63,7 +63,7 @@ protected: canvas->drawRect(rect2, p); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; } private: typedef skiagm::GM INHERITED; diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp index 5371fe2133..061c442334 100644 --- a/gm/cmykjpeg.cpp +++ b/gm/cmykjpeg.cpp @@ -22,7 +22,7 @@ public: CMYKJpegGM() {} protected: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { // parameters to the "decode" call bool dither = false; diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 51ac9239a6..c083f31310 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -54,7 +54,7 @@ public: SkSafeUnref(fTypeface); } protected: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { SkString filename = GetResourcePath("/Funkster.ttf"); SkAutoTUnref<SkFILEStream> stream(new SkFILEStream(filename.c_str())); if (!stream->isValid()) { @@ -65,15 +65,15 @@ protected: fTypeface = SkTypeface::CreateFromStream(stream); } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("coloremoji"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(650, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(SK_ColorGRAY); diff --git a/gm/colorfilters.cpp b/gm/colorfilters.cpp index 5af2122dc9..9f278a5b40 100644 --- a/gm/colorfilters.cpp +++ b/gm/colorfilters.cpp @@ -49,11 +49,11 @@ protected: return SkISize::Make(640, 480); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkRect r; r.setWH(600, 50); diff --git a/gm/colortype.cpp b/gm/colortype.cpp index 1d6dfad469..9b541fa857 100644 --- a/gm/colortype.cpp +++ b/gm/colortype.cpp @@ -40,15 +40,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("colortype"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setTypeface(fColorType); diff --git a/gm/colortypexfermode.cpp b/gm/colortypexfermode.cpp index 89656c4628..cd1b249cd1 100644 --- a/gm/colortypexfermode.cpp +++ b/gm/colortypexfermode.cpp @@ -18,7 +18,7 @@ static uint16_t gData[] = { 0xFFFF, 0xCCCF, 0xCCCF, 0xFFFF }; class ColorTypeXfermodeGM : public GM { SkBitmap fBG; - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fBG.installPixels(SkImageInfo::Make(2, 2, kARGB_4444_SkColorType, kOpaque_SkAlphaType), gData, 4); } diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index ebb7707c9c..f3d5a33d19 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -27,7 +27,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp index 8688c86465..64cf3c83a0 100644 --- a/gm/complexclip2.cpp +++ b/gm/complexclip2.cpp @@ -111,7 +111,7 @@ protected: return ""; } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { if (kRect_Clip != fClip) { return kSkipTiled_Flag; } diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index c9c8fe45a9..76ff8edfc4 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -49,15 +49,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("composeshader"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(120, 120); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; @@ -79,15 +79,15 @@ public: ComposeShaderAlphaGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("composeshader_alpha"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(220, 750); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkAutoTUnref<SkShader> shader0(make_shader(SkXfermode::kDstIn_Mode)); SkAutoTUnref<SkShader> shader1(make_shader(SkXfermode::kSrcOver_Mode)); SkShader* shaders[] = { shader0.get(), shader1.get() }; diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp index 4f9633d8b7..01497b5ab1 100644 --- a/gm/convexpaths.cpp +++ b/gm/convexpaths.cpp @@ -34,7 +34,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index 328cdb5207..f7aac897c7 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp @@ -79,11 +79,11 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("convex_poly_clip"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { // When benchmarking the saveLayer set of draws is skipped. int w = 435; if (kBench_Mode != this->getMode()) { @@ -92,7 +92,7 @@ protected: return SkISize::Make(w, 540); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { SkPath tri; tri.moveTo(5.f, 5.f); tri.lineTo(100.f, 20.f); @@ -135,7 +135,7 @@ protected: fBmp = make_bmp(100, 100); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar y = 0; static const SkScalar kMargin = 10.f; diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 68610e04f0..1ec7853dad 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -34,20 +34,20 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("convex_poly_effect"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(720, 800); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // This is a GPU-specific GM. return kGPUOnly_Flag; } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { SkPath tri; tri.moveTo(5.f, 5.f); tri.lineTo(100.f, 20.f); @@ -97,7 +97,7 @@ protected: fRects.addToTail(SkRect::MakeLTRB(100.f, 50.5f, 5.f, 0.5f)); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); if (NULL == rt) { return; diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index 9c6cffbdb3..bf05db7845 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -16,7 +16,7 @@ public: ClippedCubicGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -59,7 +59,7 @@ public: CubicPathGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -208,7 +208,7 @@ public: CubicClosePathGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/dashcubics.cpp b/gm/dashcubics.cpp index 1e23f15a53..3d2d8d1413 100644 --- a/gm/dashcubics.cpp +++ b/gm/dashcubics.cpp @@ -20,7 +20,7 @@ public: DashCubicsGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/dashing.cpp b/gm/dashing.cpp index 7e32bfaf90..a5d234f482 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -49,7 +49,7 @@ public: DashingGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -136,7 +136,7 @@ public: Dashing2GM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -198,7 +198,7 @@ public: Dashing3GM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -331,7 +331,7 @@ public: Dashing4GM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -414,9 +414,9 @@ public: Dashing5GM(bool doAA) : fDoAA(doAA) {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kAsBench_Flag | kSkipTiled_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kAsBench_Flag | kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { if (fDoAA) { return SkString("dashing5_aa"); } else { @@ -424,9 +424,9 @@ protected: } } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(400, 200); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(400, 200); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const int kOn = 4; static const int kOff = 4; static const int kIntervalLength = kOn + kOff; diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp index 5435d533f8..09de2eed36 100644 --- a/gm/degeneratesegments.cpp +++ b/gm/degeneratesegments.cpp @@ -22,7 +22,7 @@ protected: const char* fName2; }; - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/dftext.cpp b/gm/dftext.cpp index d501e58673..36b8d5501c 100755 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -23,7 +23,7 @@ public: } protected: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { SkString filename = GetResourcePath("/Funkster.ttf"); SkAutoTUnref<SkFILEStream> stream(new SkFILEStream(filename.c_str())); if (!stream->isValid()) { @@ -34,15 +34,15 @@ protected: fTypeface = SkTypeface::CreateFromStream(stream); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("dftext"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 768); } diff --git a/gm/discard.cpp b/gm/discard.cpp index ff8fe4a4b8..58a08499c5 100644 --- a/gm/discard.cpp +++ b/gm/discard.cpp @@ -25,18 +25,18 @@ public: DiscardGM() { } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("discard"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(100, 100); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrContext* context = canvas->getGrContext(); if (NULL == context) { return; diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index 994ab9412b..ce10b47a84 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -40,15 +40,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { make_bitmap_wrapper(); return SkISize::Make(fBM.width(), 4 * fBM.height()); } @@ -62,7 +62,7 @@ protected: virtual void make_bitmap() = 0; - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { make_bitmap_wrapper(); int curY = 0; @@ -103,7 +103,7 @@ class DownsampleBitmapTextGM: public DownsampleBitmapGM { protected: float fTextSize; - virtual void make_bitmap() SK_OVERRIDE { + void make_bitmap() SK_OVERRIDE { fBM.allocN32Pixels(int(fTextSize * 8), int(fTextSize * 6)); SkCanvas canvas(fBM); canvas.drawColor(SK_ColorWHITE); @@ -138,7 +138,7 @@ class DownsampleBitmapCheckerboardGM: public DownsampleBitmapGM { int fSize; int fNumChecks; - virtual void make_bitmap() SK_OVERRIDE { + void make_bitmap() SK_OVERRIDE { fBM.allocN32Pixels(fSize, fSize); for (int y = 0; y < fSize; ++y) { for (int x = 0; x < fSize; ++x) { @@ -169,7 +169,7 @@ class DownsampleBitmapImageGM: public DownsampleBitmapGM { SkString fFilename; int fSize; - virtual void make_bitmap() SK_OVERRIDE { + void make_bitmap() SK_OVERRIDE { SkImageDecoder* codec = NULL; SkString resourcePath = GetResourcePath(fFilename.c_str()); SkFILEStream stream(resourcePath.c_str()); diff --git a/gm/drawlooper.cpp b/gm/drawlooper.cpp index a1b55bbc3f..1d16fb5955 100644 --- a/gm/drawlooper.cpp +++ b/gm/drawlooper.cpp @@ -31,11 +31,11 @@ protected: return SkISize::Make(520, 160); } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("drawlooper"); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->init(); SkPaint paint; diff --git a/gm/drrect.cpp b/gm/drrect.cpp index d7cd894a79..16c45b745e 100644 --- a/gm/drrect.cpp +++ b/gm/drrect.cpp @@ -15,19 +15,19 @@ public: DRRectGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("drrect"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); diff --git a/gm/emboss.cpp b/gm/emboss.cpp index c2ee49723f..a72e64d760 100644 --- a/gm/emboss.cpp +++ b/gm/emboss.cpp @@ -29,15 +29,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("emboss"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(600, 120); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkBitmap bm = make_bm(); canvas->drawBitmap(bm, 10, 10, &paint); diff --git a/gm/etc1bitmap.cpp b/gm/etc1bitmap.cpp index 76593f4441..e93ed1d7e8 100644 --- a/gm/etc1bitmap.cpp +++ b/gm/etc1bitmap.cpp @@ -81,19 +81,19 @@ public: virtual ~ETC1BitmapGM() { } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString str = SkString("etc1bitmap_"); str.append(this->fileExtension()); return str; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(128, 128); } virtual SkString fileExtension() const = 0; - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkBitmap bm; SkString filename = GetResourcePath("mandrill_128."); filename.append(this->fileExtension()); @@ -123,7 +123,7 @@ public: protected: - virtual SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); } + SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); } private: typedef ETC1BitmapGM INHERITED; @@ -137,7 +137,7 @@ public: protected: - virtual SkString fileExtension() const SK_OVERRIDE { return SkString("ktx"); } + SkString fileExtension() const SK_OVERRIDE { return SkString("ktx"); } private: typedef ETC1BitmapGM INHERITED; @@ -151,7 +151,7 @@ public: protected: - virtual SkString fileExtension() const SK_OVERRIDE { return SkString("r11.ktx"); } + SkString fileExtension() const SK_OVERRIDE { return SkString("r11.ktx"); } private: typedef ETC1BitmapGM INHERITED; @@ -170,15 +170,15 @@ public: virtual ~ETC1Bitmap_NPOT_GM() { } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("etc1bitmap_npot"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(124, 124); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkBitmap bm; SkString pkmFilename = GetResourcePath("mandrill_128.pkm"); SkAutoDataUnref fileData(SkData::NewFromFileName(pkmFilename.c_str())); diff --git a/gm/extractbitmap.cpp b/gm/extractbitmap.cpp index 711a20a481..c324483336 100644 --- a/gm/extractbitmap.cpp +++ b/gm/extractbitmap.cpp @@ -32,15 +32,15 @@ public: protected: // overrides from SkEventSink - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("extractbitmap"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(600, 600); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkBitmap bitmap; create_bitmap(&bitmap); int x = bitmap.width() / 2; diff --git a/gm/factory.cpp b/gm/factory.cpp index 9cc5bb8df4..a2dc4dd282 100644 --- a/gm/factory.cpp +++ b/gm/factory.cpp @@ -27,7 +27,7 @@ public: FactoryGM() {} protected: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { // Copyright-free file from http://openclipart.org/detail/29213/paper-plane-by-ddoo SkString pngFilename = GetResourcePath("plane.png"); SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str())); diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp index 176c7bf7ea..e4b8a8d2cd 100644 --- a/gm/fatpathfill.cpp +++ b/gm/fatpathfill.cpp @@ -56,7 +56,7 @@ public: FatPathFillGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp index dbbe4fefbd..0d7e2c63e6 100644 --- a/gm/filltypes.cpp +++ b/gm/filltypes.cpp @@ -25,15 +25,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("filltypes"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(835, 840); } @@ -64,7 +64,7 @@ protected: scale, paint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->makePath(); canvas->translate(SkIntToScalar(20), SkIntToScalar(20)); diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp index 3fff059b2d..e9cf6a77f1 100644 --- a/gm/filltypespersp.cpp +++ b/gm/filltypespersp.cpp @@ -24,15 +24,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("filltypespersp"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(835, 840); } @@ -76,7 +76,7 @@ protected: scale, paint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->makePath(); // do perspective drawPaint as the background; diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index b4c5f6ac30..57041fb62d 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -70,22 +70,22 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 768); } virtual void makeBitmap() = 0; virtual SkScalar getScale() = 0; - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(10, 10); for (size_t i = 0; i < SK_ARRAY_COUNT(fMatrix); ++i) { diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp index 04e2087bf3..35ccf6e62d 100644 --- a/gm/filterindiabox.cpp +++ b/gm/filterindiabox.cpp @@ -70,22 +70,22 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } #ifdef SK_CPU_ARM64 // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } #endif - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 768); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(10, 10); for (size_t i = 0; i < SK_ARRAY_COUNT(fMatrix); ++i) { SkSize size = computeSize(fBM, fMatrix[i]); diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index 99554a2c32..3363e24ba3 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -47,15 +47,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("fontcache"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 640); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { int typefaceCount = 0; for (size_t i = 0; i < SK_ARRAY_COUNT(gFamilyNames); ++i) { for (size_t j = 0; j < SK_ARRAY_COUNT(gStyles); ++j) { @@ -65,7 +65,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar y = 32; SkPaint paint; paint.setAntiAlias(true); @@ -88,7 +88,7 @@ protected: } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // this GM is meant only for the GPU return kGPUOnly_Flag; } diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index a7ff8a8620..9d0e3509f1 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -68,15 +68,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1536, 768); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar y = 20; SkPaint paint; paint.setAntiAlias(true); @@ -115,7 +115,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // fontdescriptors (and therefore serialization) don't yet understand // these new styles, so skip tests that exercise that for now. @@ -140,11 +140,11 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("fontmgr_match"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 1024); } @@ -186,7 +186,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setLCDRenderText(true); @@ -214,7 +214,7 @@ protected: this->iterateFamily(canvas, paint, fset); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // fontdescriptors (and therefore serialization) don't yet understand // these new styles, so skip tests that exercise that for now. return kSkipPicture_Flag | kSkipPipe_Flag; @@ -253,15 +253,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 850); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setSubpixelText(true); @@ -300,7 +300,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // fontdescriptors (and therefore serialization) don't yet understand // these new styles, so skip tests that exercise that for now. diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp index 6fd763cbe2..99af04e911 100644 --- a/gm/fontscaler.cpp +++ b/gm/fontscaler.cpp @@ -19,15 +19,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("fontscaler"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1450, 750); } @@ -39,7 +39,7 @@ protected: canvas->translate(-px, -py); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp index 71086693d5..0580989739 100644 --- a/gm/gammatext.cpp +++ b/gm/gammatext.cpp @@ -138,7 +138,7 @@ public: } } - virtual ~GammaShaderTextGM() SK_OVERRIDE { + ~GammaShaderTextGM() SK_OVERRIDE { for (size_t i = 0; i < SK_ARRAY_COUNT(fShaders); ++i) { SkSafeUnref(fShaders[i]); } diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp index 8cad512c3c..c5e01b69a6 100644 --- a/gm/getpostextpath.cpp +++ b/gm/getpostextpath.cpp @@ -16,7 +16,7 @@ public: GetPosTextPathGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -34,7 +34,7 @@ protected: canvas->drawPath(path, paint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // explicitly add spaces, to test a prev. bug const char* text = "Ham bur ge fons"; int len = SkToInt(strlen(text)); diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp index 87aee36daf..d38226986b 100644 --- a/gm/giantbitmap.cpp +++ b/gm/giantbitmap.cpp @@ -71,7 +71,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { #ifdef SK_BUILD_FOR_ANDROID return kSkipTiled_Flag; #else @@ -82,7 +82,7 @@ protected: #endif } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString str("giantbitmap_"); switch (fMode) { case SkShader::kClamp_TileMode: @@ -102,9 +102,9 @@ protected: return str; } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkMatrix m; diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp index dd814cf28c..893de13a7d 100644 --- a/gm/glyph_pos.cpp +++ b/gm/glyph_pos.cpp @@ -27,11 +27,11 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString str("glyph_pos"); if (fStrokeWidth == 0.0f) { str.append("_h"); // h == Hairline. @@ -48,9 +48,9 @@ protected: return str; } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (!fProp) { fProp.reset(sk_tool_utils::create_portable_typeface("Helvetica", SkTypeface::kNormal)); } diff --git a/gm/glyph_pos_align.cpp b/gm/glyph_pos_align.cpp index 3ce3a88781..ef2eae24ab 100644 --- a/gm/glyph_pos_align.cpp +++ b/gm/glyph_pos_align.cpp @@ -21,17 +21,17 @@ namespace skiagm { class GlyphPosAlignGM : public GM { protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("glyph_pos_align"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, kHeight); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, kHeight); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->clear(SK_ColorBLACK); SkPaint paint; @@ -27,11 +27,11 @@ // See colorwheel.cpp for example usage. #define DEF_SIMPLE_GM(NAME, CANVAS, W, H) \ class SK_MACRO_CONCAT(NAME, _GM) : public skiagm::GM { \ - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE; \ - virtual SkISize onISize() SK_OVERRIDE { \ + void onDraw(SkCanvas* canvas) SK_OVERRIDE; \ + SkISize onISize() SK_OVERRIDE { \ return SkISize::Make((W), (H)); \ } \ - virtual SkString onShortName() SK_OVERRIDE { \ + SkString onShortName() SK_OVERRIDE { \ return SkString(#NAME); \ } \ }; \ diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 6201950657..8f6d53a255 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -174,7 +174,7 @@ struct PDFRasterizerData { class BWTextDrawFilter : public SkDrawFilter { public: - virtual bool filter(SkPaint*, Type) SK_OVERRIDE; + bool filter(SkPaint*, Type) SK_OVERRIDE; }; bool BWTextDrawFilter::filter(SkPaint* p, Type t) { if (kText_Type == t) { diff --git a/gm/gradientDirtyLaundry.cpp b/gm/gradientDirtyLaundry.cpp index a452763a9b..8c27b8f429 100644 --- a/gm/gradientDirtyLaundry.cpp +++ b/gm/gradientDirtyLaundry.cpp @@ -71,9 +71,9 @@ public: protected: SkString onShortName() SK_OVERRIDE { return SkString("gradient_dirty_laundry"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPoint pts[2] = { { 0, 0 }, { SkIntToScalar(100), SkIntToScalar(100) } }; diff --git a/gm/gradient_matrix.cpp b/gm/gradient_matrix.cpp index 275acc8868..94f40cba86 100644 --- a/gm/gradient_matrix.cpp +++ b/gm/gradient_matrix.cpp @@ -120,7 +120,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -128,11 +128,11 @@ protected: return SkString("gradient_matrix"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 800); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { draw_gradients(canvas, &make_linear_gradient, linearPts, SK_ARRAY_COUNT(linearPts)); diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 481b476e37..98093ab800 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -105,7 +105,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -162,7 +162,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -334,16 +334,16 @@ public: RadialGradientGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1280, 1280); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const SkISize dim = this->getISize(); this->drawBG(canvas); @@ -377,18 +377,18 @@ public: RadialGradient2GM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } SkString onShortName() SK_OVERRIDE { return SkString("radial_gradient2"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 400); } void drawBG(SkCanvas* canvas) { canvas->drawColor(0xFF000000); } // Reproduces the example given in bug 7671058. - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint1, paint2, paint3; paint1.setStyle(SkPaint::kFill_Style); paint2.setStyle(SkPaint::kFill_Style); diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index 041807b42a..789137bf0e 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -85,14 +85,14 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } SkString onShortName() SK_OVERRIDE { return SkString("gradients_no_texture"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const SkPoint kPts[2] = { { 0, 0 }, { SkIntToScalar(50), SkIntToScalar(50) } }; static const SkShader::TileMode kTM = SkShader::kClamp_TileMode; @@ -211,14 +211,14 @@ public: GradientsManyColorsGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } SkString onShortName() SK_OVERRIDE { return SkString("gradients_many"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const Proc procs[] = { make0, make1, make2, }; diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp index 11dc29cc21..f2123df5d6 100644 --- a/gm/gradtext.cpp +++ b/gm/gradtext.cpp @@ -102,7 +102,7 @@ public: GradTextGM () {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("gradtext"); } diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp index 9a0b8d55ce..286cc82d56 100644 --- a/gm/hairlines.cpp +++ b/gm/hairlines.cpp @@ -13,18 +13,18 @@ namespace skiagm { class HairlinesGM : public GM { protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("hairlines"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1250, 1250); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1250, 1250); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { { SkPath* lineAnglesPath = &fPaths.push_back(); enum { @@ -164,7 +164,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const SkAlpha kAlphaValue[] = { 0xFF, 0x40 }; static const SkScalar kWidths[] = { 0, 0.5f, 1.5f }; diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp index 9e9a1de53c..46be078735 100644 --- a/gm/hairmodes.cpp +++ b/gm/hairmodes.cpp @@ -78,17 +78,17 @@ namespace skiagm { SkPaint fBGPaint; protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("hairmodes"); } virtual SkISize onISize() { return SkISize::Make(640, 480); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fBGPaint.setShader(make_bg_shader())->unref(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const SkRect bounds = SkRect::MakeWH(W, H); static const SkAlpha gAlphaValue[] = { 0xFF, 0x88, 0x88 }; diff --git a/gm/hittestpath.cpp b/gm/hittestpath.cpp index 88772d6327..36a7cb4808 100644 --- a/gm/hittestpath.cpp +++ b/gm/hittestpath.cpp @@ -34,17 +34,17 @@ public: HitTestPathGM () {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("hittestpath"); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPath path; SkRandom rand; diff --git a/gm/image.cpp b/gm/image.cpp index bd7bbe7952..d10152987f 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -191,7 +191,7 @@ protected: #endif } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return GM::kSkipPicture_Flag | GM::kSkipPipe_Flag; } diff --git a/gm/imagealphathreshold.cpp b/gm/imagealphathreshold.cpp index 947f72acee..b2259949c6 100644 --- a/gm/imagealphathreshold.cpp +++ b/gm/imagealphathreshold.cpp @@ -21,7 +21,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return this->INHERITED::onGetFlags() | GM::kSkipTiled_Flag | GM::kSkipPicture_Flag | @@ -29,15 +29,15 @@ protected: GM::kSkipPipeCrossProcess_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("imagealphathreshold"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkIRect rects[2]; rects[0] = SkIRect::MakeXYWH(0, 150, WIDTH, HEIGHT - 300); rects[1] = SkIRect::MakeXYWH(150, 0, WIDTH - 300, HEIGHT); diff --git a/gm/imageblur.cpp b/gm/imageblur.cpp index 67dca07779..df1e8a2778 100644 --- a/gm/imageblur.cpp +++ b/gm/imageblur.cpp @@ -23,19 +23,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setImageFilter(SkBlurImageFilter::Create(fSigmaX, fSigmaY))->unref(); canvas->saveLayer(NULL, &paint); diff --git a/gm/imageblur2.cpp b/gm/imageblur2.cpp index 629d384048..aafd01e5b5 100644 --- a/gm/imageblur2.cpp +++ b/gm/imageblur2.cpp @@ -36,19 +36,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const int sigmaCount = SK_ARRAY_COUNT(kBlurSigmas); const int testStringCount = SK_ARRAY_COUNT(kTestStrings); SkScalar dx = WIDTH / sigmaCount; diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index 74bd2ad2fb..cfe9327a44 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -31,15 +31,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("imagefiltersclipped"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(860, 500); } @@ -83,7 +83,7 @@ protected: canvas.drawCircle(x, y, radius, paint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (!fInitialized) { this->make_checkerboard(); this->make_gradient_circle(64, 64); diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index ae6f4a6d1f..c66ee83ccf 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -66,7 +66,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SimpleOffsetFilter); protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fDX); buffer.writeScalar(fDY); @@ -102,7 +102,7 @@ public: ImageFiltersGraphGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index 8b44bd0563..d68f8cfcb8 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -31,7 +31,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/imagemagnifier.cpp b/gm/imagemagnifier.cpp index 371b3088f9..feac4c19cf 100644 --- a/gm/imagemagnifier.cpp +++ b/gm/imagemagnifier.cpp @@ -21,20 +21,20 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // Skip tiled drawing until https://code.google.com/p/skia/issues/detail?id=781 is fixed. return this->INHERITED::onGetFlags() | GM::kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("imagemagnifier"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint filterPaint; filterPaint.setImageFilter( SkMagnifierImageFilter::Create( diff --git a/gm/imageresizetiled.cpp b/gm/imageresizetiled.cpp index d09fd27829..e8b46c47aa 100644 --- a/gm/imageresizetiled.cpp +++ b/gm/imageresizetiled.cpp @@ -22,17 +22,17 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kNoBBH_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kNoBBH_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("imageresizetiled"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkMatrix matrix; matrix.setScale(RESIZE_FACTOR, RESIZE_FACTOR); diff --git a/gm/inversepaths.cpp b/gm/inversepaths.cpp index 64af2b178c..75edaaabc6 100644 --- a/gm/inversepaths.cpp +++ b/gm/inversepaths.cpp @@ -70,19 +70,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("inverse_paths"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 900); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar cx = slideWidth / 2 + slideBoundary; SkScalar cy = slideHeight / 2 + slideBoundary; SkScalar dx = slideWidth + 2 * slideBoundary; diff --git a/gm/lcdtext.cpp b/gm/lcdtext.cpp index a6e31bce5f..b207989a8b 100644 --- a/gm/lcdtext.cpp +++ b/gm/lcdtext.cpp @@ -162,7 +162,7 @@ protected: return kSkip565_Flag; } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fInfo = SkImageInfo::MakeN32Premul(100, 100); SkPictureRecorder recorder; DrawText(recorder.beginRecording(SkIntToScalar(fInfo.width()), @@ -172,7 +172,7 @@ protected: fFilterPaint.setImageFilter(filter.get()); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const SkPixelGeometry geos[] = { kRGB_H_SkPixelGeometry, kUnknown_SkPixelGeometry, diff --git a/gm/lerpmode.cpp b/gm/lerpmode.cpp index 30e6abd523..7b567a24a4 100644 --- a/gm/lerpmode.cpp +++ b/gm/lerpmode.cpp @@ -39,15 +39,15 @@ public: LerpXfermodeGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("lerpmode"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(240, 120); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { show_circlelayers(canvas, NULL); canvas->translate(150, 0); SkAutoTUnref<SkXfermode> mode(SkLerpXfermode::Create(0.5f)); diff --git a/gm/lighting.cpp b/gm/lighting.cpp index e56d9fc0c7..4952256068 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -20,11 +20,11 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("lighting"); } @@ -41,7 +41,7 @@ protected: canvas.drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } @@ -54,7 +54,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (!fInitialized) { make_bitmap(); fInitialized = true; diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp index 05900c758e..26e7a217d7 100644 --- a/gm/linepaths.cpp +++ b/gm/linepaths.cpp @@ -16,7 +16,7 @@ public: LinePathGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index 521a61bc28..88b2924a17 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -98,19 +98,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("lumafilter"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(600, 420); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkXfermode::Mode modes[] = { SkXfermode::kSrcOver_Mode, SkXfermode::kDstOver_Mode, SkXfermode::kSrcATop_Mode, diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index aff3850d6a..56bb0cdad3 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -19,7 +19,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } diff --git a/gm/mixedxfermodes.cpp b/gm/mixedxfermodes.cpp index 3e5ee7d1d3..331d1ec0bd 100644 --- a/gm/mixedxfermodes.cpp +++ b/gm/mixedxfermodes.cpp @@ -31,11 +31,11 @@ protected: kNumShapeTypes }; - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("mixed_xfermodes"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(790, 640); } @@ -87,7 +87,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (NULL == fBG.get()) { static uint32_t kCheckerPixelData[] = { 0xFFFFFFFF, 0xFFCCCCCC, diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 250c28a8d9..c7da676af6 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -486,14 +486,14 @@ namespace skiagm { Layout fLayout; const SkPicture* fPictures[kNumPictures]; - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fPictures[0] = make_hex_plane_picture(SK_ColorWHITE); fPictures[1] = make_hex_plane_picture(SK_ColorGRAY); fPictures[2] = make_sierpinski_picture(); fPictures[3] = make_single_layer_hex_plane_picture(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkMultiPictureDraw mpd; SkTArray<ComposeStep> composeSteps; @@ -514,9 +514,9 @@ namespace skiagm { } } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(kPicWidth, kPicHeight); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kPicWidth, kPicHeight); } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { static const char* gContentNames[] = { "noclip", "rectclip", "rrectclip", "pathclip", "invpathclip", "sierpinski", "biglayer" @@ -534,7 +534,7 @@ namespace skiagm { return name; } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kAsBench_Flag | kSkipTiled_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kAsBench_Flag | kSkipTiled_Flag; } private: typedef GM INHERITED; diff --git a/gm/nested.cpp b/gm/nested.cpp index 5a337f4153..5c7b09ca0b 100644 --- a/gm/nested.cpp +++ b/gm/nested.cpp @@ -19,11 +19,11 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString name("nested"); if (fDoAA) { name.append("_aa"); @@ -33,7 +33,7 @@ protected: return name; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kImageWidth, kImageHeight); } @@ -63,7 +63,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint shapePaint; shapePaint.setColor(SK_ColorBLACK); diff --git a/gm/nonclosedpaths.cpp b/gm/nonclosedpaths.cpp index 9c5096666b..189daff79c 100644 --- a/gm/nonclosedpaths.cpp +++ b/gm/nonclosedpaths.cpp @@ -32,16 +32,16 @@ public: }; protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("nonclosedpaths"); } // 12 * 18 + 3 cases, every case is 100 * 100 pixels. - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1220, 1920); } @@ -70,7 +70,7 @@ protected: canvas->translate(x, y); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // Stroke widths are: // 0(may use hairline rendering), 10(common case for stroke-style) // 40 and 50(>= geometry width/height, make the contour filled in fact) diff --git a/gm/ovals.cpp b/gm/ovals.cpp index 4afabc284d..a4232aab37 100755 --- a/gm/ovals.cpp +++ b/gm/ovals.cpp @@ -26,15 +26,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("ovals"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 900); } @@ -138,7 +138,7 @@ protected: return SkHSVToColor(hsv); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRandom rand(1); canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1); SkRect oval = SkRect::MakeLTRB(-20, -30, 20, 30); diff --git a/gm/patch.cpp b/gm/patch.cpp index 2579993b82..3a09ad8620 100644 --- a/gm/patch.cpp +++ b/gm/patch.cpp @@ -76,19 +76,19 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("patch_primitive"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 800); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; diff --git a/gm/patchgrid.cpp b/gm/patchgrid.cpp index 79baf94253..aefa20b0e5 100644 --- a/gm/patchgrid.cpp +++ b/gm/patchgrid.cpp @@ -64,19 +64,19 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("patch_grid"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 800); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; diff --git a/gm/patheffects.cpp b/gm/patheffects.cpp index 00ae21529b..b24bd90061 100644 --- a/gm/patheffects.cpp +++ b/gm/patheffects.cpp @@ -107,7 +107,7 @@ public: PathEffectGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -117,7 +117,7 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setStyle(SkPaint::kStroke_Style); diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp index 80342d6d54..b4e5a020e7 100644 --- a/gm/pathfill.cpp +++ b/gm/pathfill.cpp @@ -125,19 +125,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pathfill"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); @@ -163,15 +163,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pathinvfill"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(450, 220); } @@ -188,7 +188,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPath path; path.addCircle(SkIntToScalar(50), SkIntToScalar(50), SkIntToScalar(40)); diff --git a/gm/pathinterior.cpp b/gm/pathinterior.cpp index 865e32b5de..a354513664 100644 --- a/gm/pathinterior.cpp +++ b/gm/pathinterior.cpp @@ -25,11 +25,11 @@ public: } protected: - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(770, 770); } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pathinterior"); } @@ -57,7 +57,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(8.5f, 8.5f); const SkRect rect = { 0, 0, 80, 80 }; diff --git a/gm/pathopsinverse.cpp b/gm/pathopsinverse.cpp index 743db222e7..9fe787206a 100644 --- a/gm/pathopsinverse.cpp +++ b/gm/pathopsinverse.cpp @@ -19,7 +19,7 @@ public: } protected: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { const unsigned oneColor = 0xFF8080FF; const unsigned twoColor = 0x807F1f1f; SkColor blendColor = blend(oneColor, twoColor); @@ -50,15 +50,15 @@ protected: paint->setColor(color); } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pathopsinverse"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 900); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPath one, two; int yPos = 0; for (int oneFill = 0; oneFill <= 1; ++oneFill) { diff --git a/gm/pathopsskpclip.cpp b/gm/pathopsskpclip.cpp index 5d6e4013d9..ee6765af55 100644 --- a/gm/pathopsskpclip.cpp +++ b/gm/pathopsskpclip.cpp @@ -24,15 +24,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pathopsskpclip"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 900); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPictureRecorder recorder; SkCanvas* rec = recorder.beginRecording(1200, 900, NULL, 0); SkPath p; diff --git a/gm/pathreverse.cpp b/gm/pathreverse.cpp index 7cb7ba1cdc..dbd58e561c 100644 --- a/gm/pathreverse.cpp +++ b/gm/pathreverse.cpp @@ -68,19 +68,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("path-reverse"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (false) test_rev(canvas); // avoid bit rot, suppress warning SkRect r = { 10, 10, 100, 60 }; diff --git a/gm/peekpixels.cpp b/gm/peekpixels.cpp index b5573f3458..24e509c42b 100644 --- a/gm/peekpixels.cpp +++ b/gm/peekpixels.cpp @@ -24,15 +24,15 @@ public: PeekPixelsGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("peekpixels"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(360, 120); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); SkAutoTUnref<SkSurface> surface(canvas->newSurface(info)); if (surface.get()) { @@ -64,7 +64,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // we explicitly test peekPixels and readPixels, neither of which // return something for a picture-backed canvas, so we skip that test. return kSkipPicture_Flag; diff --git a/gm/picture.cpp b/gm/picture.cpp index 1f7e5c38c9..b07a5969a9 100644 --- a/gm/picture.cpp +++ b/gm/picture.cpp @@ -42,15 +42,15 @@ public: PictureGM() : fPicture(make_picture()) {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pictures"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(450, 120); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(10, 10); SkMatrix matrix; diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp index 5f29a34b79..eae758d344 100644 --- a/gm/pictureimagefilter.cpp +++ b/gm/pictureimagefilter.cpp @@ -18,7 +18,7 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pictureimagefilter"); } @@ -36,9 +36,9 @@ protected: fPicture.reset(recorder.endRecording()); } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(600, 300); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(600, 300); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { this->makePicture(); } @@ -51,7 +51,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->clear(0x00000000); { SkRect srcRect = SkRect::MakeXYWH(20, 20, 30, 30); diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp index 152cdf37a4..c622ee3fae 100644 --- a/gm/pictureshader.cpp +++ b/gm/pictureshader.cpp @@ -42,19 +42,19 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("pictureshader"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1400, 1250); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { this->drawSceneColumn(canvas, SkPoint::Make(0, 0), 1, 1, 0); this->drawSceneColumn(canvas, SkPoint::Make(0, fSceneSize * 6.4f), 1, 2, 0); this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 2.4f, 0), 1, 1, 1); diff --git a/gm/points.cpp b/gm/points.cpp index 1f9a5811b1..58233ddd29 100644 --- a/gm/points.cpp +++ b/gm/points.cpp @@ -15,15 +15,15 @@ public: PointsGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("points"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 490); } @@ -38,7 +38,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(SK_Scalar1, SK_Scalar1); SkRandom rand; diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp index 191bb0eaea..728650e210 100644 --- a/gm/poly2poly.cpp +++ b/gm/poly2poly.cpp @@ -179,15 +179,15 @@ public: Poly2PolyGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("poly2poly"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(835, 840); } @@ -225,7 +225,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (false) { test_stroke(canvas); return; } SkPaint paint; diff --git a/gm/polygons.cpp b/gm/polygons.cpp index 1d639780fd..e8d85040d2 100644 --- a/gm/polygons.cpp +++ b/gm/polygons.cpp @@ -22,22 +22,22 @@ public: PolygonsGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("polygons"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { int width = kNumPolygons * kCellSize + 40; int height = (kNumJoins * kNumStrokeWidths + kNumExtraStyles) * kCellSize + 40; return SkISize::Make(width, height); } // Construct all polygons - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { SkPoint p0[] = {{0, 0}, {60, 0}, {90, 40}}; // triangle SkPoint p1[] = {{0, 0}, {0, 40}, {60, 40}, {40, 0}}; // trapezoid SkPoint p2[] = {{0, 0}, {40, 40}, {80, 40}, {40, 0}}; // diamond @@ -97,7 +97,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // Stroke widths are: // 0(may use hairline rendering), 10(common case for stroke-style) // 40(>= geometry width/height, make the contour filled in fact) diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp index f6e9fad07f..6d4f5176d9 100644 --- a/gm/quadpaths.cpp +++ b/gm/quadpaths.cpp @@ -16,7 +16,7 @@ public: QuadPathGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -43,7 +43,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { struct FillAndName { SkPath::FillType fFill; const char* fName; @@ -164,7 +164,7 @@ public: QuadClosePathGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -191,7 +191,7 @@ protected: canvas->restore(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { struct FillAndName { SkPath::FillType fFill; const char* fName; diff --git a/gm/rects.cpp b/gm/rects.cpp index 217d849548..e0b25ae571 100644 --- a/gm/rects.cpp +++ b/gm/rects.cpp @@ -25,15 +25,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("rects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 900); } @@ -254,7 +254,7 @@ protected: SK_Scalar1 * 100 * (testCount / 10) + 3 * SK_Scalar1 / 4); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkAutoCommentBlock acb(canvas, "onDraw"); canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1); diff --git a/gm/resizeimagefilter.cpp b/gm/resizeimagefilter.cpp index bb09e0b079..351421e37f 100644 --- a/gm/resizeimagefilter.cpp +++ b/gm/resizeimagefilter.cpp @@ -27,7 +27,7 @@ protected: #ifdef SK_CPU_ARM64 // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } #endif diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp index 669763d9a7..8d81d16e61 100644 --- a/gm/roundrects.cpp +++ b/gm/roundrects.cpp @@ -27,15 +27,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("roundrects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 900); } @@ -139,7 +139,7 @@ protected: return SkHSVToColor(hsv); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRandom rand(1); canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1); SkRect rect = SkRect::MakeLTRB(-20, -30, 20, 30); diff --git a/gm/rrect.cpp b/gm/rrect.cpp index a426707b87..9bc1995dd3 100644 --- a/gm/rrect.cpp +++ b/gm/rrect.cpp @@ -126,19 +126,19 @@ public: RRectGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("rrect"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(820, 710); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const InsetProc insetProcs[] = { inset0, inset1, inset2, inset3 }; diff --git a/gm/rrects.cpp b/gm/rrects.cpp index e6c62e91d6..6016891991 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -54,9 +54,9 @@ protected: return name; } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(kImageWidth, kImageHeight); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kImageWidth, kImageHeight); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { if (kEffect_Type == fType) { return kGPUOnly_Flag | kSkipTiled_Flag; } else { @@ -64,7 +64,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { #if SK_SUPPORT_GPU GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); GrContext* context = rt ? rt->getContext() : NULL; diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp index fc7d76c569..51dfde2d92 100644 --- a/gm/samplerstress.cpp +++ b/gm/samplerstress.cpp @@ -28,15 +28,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("gpusamplerstress"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } @@ -91,7 +91,7 @@ protected: fMaskFilter.reset(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, sigma)); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { createShader(); createMaskFilter(); diff --git a/gm/shaderbounds.cpp b/gm/shaderbounds.cpp index 6820fc6359..e6fcc4ef4b 100644 --- a/gm/shaderbounds.cpp +++ b/gm/shaderbounds.cpp @@ -34,7 +34,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -42,9 +42,9 @@ protected: return fName; } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(320, 240); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(320, 240); } - virtual SkMatrix onGetInitialTransform() const SK_OVERRIDE { + SkMatrix onGetInitialTransform() const SK_OVERRIDE { SkMatrix result; SkScalar scale = 0.8f; result.setScale(scale, scale); @@ -52,7 +52,7 @@ protected: return result; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // The PDF device has already clipped to the content area, but we // do it again here so that the raster and pdf results are consistent. canvas->clipRect(SkRect::MakeWH(SkIntToScalar(320), diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp index 30b15735d7..f51aba288a 100644 --- a/gm/shadertext.cpp +++ b/gm/shadertext.cpp @@ -91,7 +91,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -101,7 +101,7 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(1450, 500); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const char text[] = "Shaded Text"; const int textLen = SK_ARRAY_COUNT(text) - 1; const int pointSize = 36; diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index d33a203674..23e42ad408 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -54,7 +54,7 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(1800, 900); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { static const char kText[] = "SKIA"; static const int kTextLen = SK_ARRAY_COUNT(kText) - 1; static const int kPointSize = 55; @@ -199,7 +199,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // disable 565 for now, til mike fixes the debug assert return kSkip565_Flag | kSkipTiled_Flag; } diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index ca8dd1154d..77a9447f59 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -52,21 +52,21 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("shadertext3"); } - virtual SkISize onISize() SK_OVERRIDE{ return SkISize::Make(800, 1000); } + SkISize onISize() SK_OVERRIDE{ return SkISize::Make(800, 1000); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { makebm(&fBmp, kPointSize / 4, kPointSize / 4); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint bmpPaint; bmpPaint.setAntiAlias(true); diff --git a/gm/shallowgradient.cpp b/gm/shallowgradient.cpp index a2b29d37ed..6cd2ed61f4 100644 --- a/gm/shallowgradient.cpp +++ b/gm/shallowgradient.cpp @@ -42,22 +42,22 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { if (fName.contains("linear") || fName.contains("radial")) { return kSkipTiled_Flag; } return 0; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return fName; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 800); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { const SkColor colors[] = { 0xFF555555, 0xFF444444 }; const int colorCount = SK_ARRAY_COUNT(colors); diff --git a/gm/skbug1719.cpp b/gm/skbug1719.cpp index a57596ee3d..10936013e2 100644 --- a/gm/skbug1719.cpp +++ b/gm/skbug1719.cpp @@ -24,21 +24,21 @@ public: SkBug1719GM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("skbug1719"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(300, 100); } - virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { + void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { SkPaint bgPaint; bgPaint.setColor(0xFF303030); canvas->drawPaint(bgPaint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(SkIntToScalar(-800), SkIntToScalar(-650)); // The data is lifted from an SKP that exhibited the bug. diff --git a/gm/smallarc.cpp b/gm/smallarc.cpp index c311460e54..ff7f07c2ec 100755 --- a/gm/smallarc.cpp +++ b/gm/smallarc.cpp @@ -19,15 +19,15 @@ public: protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("smallarc"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(762, 762); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint p; p.setColor(SK_ColorRED); p.setAntiAlias(true); diff --git a/gm/spritebitmap.cpp b/gm/spritebitmap.cpp index f22c429b51..4efff3cd5a 100644 --- a/gm/spritebitmap.cpp +++ b/gm/spritebitmap.cpp @@ -62,19 +62,19 @@ public: SpriteBitmapGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("spritebitmap"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkBitmap bm; make_bm(&bm); diff --git a/gm/stringart.cpp b/gm/stringart.cpp index 2d6b737434..050d78f2d8 100644 --- a/gm/stringart.cpp +++ b/gm/stringart.cpp @@ -23,19 +23,19 @@ public: StringArtGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("stringart"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(kWidth, kHeight); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar angle = kAngle*SK_ScalarPI + SkScalarHalf(SK_ScalarPI); SkScalar size = SkIntToScalar(SkMin32(kWidth, kHeight)); SkPoint center = SkPoint::Make(SkScalarHalf(kWidth), SkScalarHalf(kHeight)); diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp index 4a29100e62..836fedae7b 100644 --- a/gm/strokefill.cpp +++ b/gm/strokefill.cpp @@ -19,15 +19,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("stroke-fill"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } @@ -39,7 +39,7 @@ protected: canvas->drawText(text, len, x, y + SkIntToScalar(120), p); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar x = SkIntToScalar(100); SkScalar y = SkIntToScalar(88); diff --git a/gm/strokerect.cpp b/gm/strokerect.cpp index 4d0353f28c..3fcb42c7de 100644 --- a/gm/strokerect.cpp +++ b/gm/strokerect.cpp @@ -46,19 +46,19 @@ public: StrokeRectGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("strokerect"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 740); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(SK_ColorWHITE); canvas->translate(STROKE_WIDTH*3/2, STROKE_WIDTH*3/2); diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp index 2a187b7544..dea8e8c1c8 100644 --- a/gm/strokerects.cpp +++ b/gm/strokerects.cpp @@ -25,15 +25,15 @@ public: StrokeRectsGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("strokerects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(W*2, H*2); } @@ -49,7 +49,7 @@ protected: r->offset(-w/2 + woffset, -h/2 + hoffset); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); diff --git a/gm/strokes.cpp b/gm/strokes.cpp index 0a8f121b49..1a6937e1bd 100644 --- a/gm/strokes.cpp +++ b/gm/strokes.cpp @@ -39,19 +39,19 @@ public: StrokesGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("strokes_round"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(W, H*2); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(SkIntToScalar(9)/2); @@ -95,15 +95,15 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("strokes_poly"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(W, H*2); } @@ -113,7 +113,7 @@ protected: canvas->concat(matrix); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(SK_ColorWHITE); SkPaint paint; @@ -196,19 +196,19 @@ public: Strokes3GM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("strokes3"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(W, H*2); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint origPaint; origPaint.setAntiAlias(true); origPaint.setStyle(SkPaint::kStroke_Style); diff --git a/gm/stroketext.cpp b/gm/stroketext.cpp index 8ca1402975..082ae54989 100644 --- a/gm/stroketext.cpp +++ b/gm/stroketext.cpp @@ -71,19 +71,19 @@ public: StrokeTextGM() {} protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("stroketext"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1200, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (true) { test_nulldev(canvas); } SkPaint paint; paint.setAntiAlias(true); diff --git a/gm/surface.cpp b/gm/surface.cpp index f84c5ab7e7..5961a336b8 100644 --- a/gm/surface.cpp +++ b/gm/surface.cpp @@ -65,11 +65,11 @@ protected: return SkString("surfaceprops"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(W * 4, H * 5); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrContext* ctx = canvas->getGrContext(); // must be opaque to have a hope of testing LCD text @@ -122,7 +122,7 @@ protected: return SkString("surfacenew"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(300, 140); } @@ -130,7 +130,7 @@ protected: canvas->drawColor(SK_ColorRED); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); SkAutoTUnref<SkSurface> surf(canvas->newSurface(info, NULL)); diff --git a/gm/techtalk1.cpp b/gm/techtalk1.cpp index 442d73ba81..c77f83cfd3 100644 --- a/gm/techtalk1.cpp +++ b/gm/techtalk1.cpp @@ -359,7 +359,7 @@ protected: fProc(canvas, fShowGL, fFlags); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPDF_Flag | kSkipPicture_Flag | kSkipPipe_Flag | kSkipTiled_Flag; } diff --git a/gm/testimagefilters.cpp b/gm/testimagefilters.cpp index 50df0e6aef..82fa833de5 100644 --- a/gm/testimagefilters.cpp +++ b/gm/testimagefilters.cpp @@ -97,17 +97,17 @@ public: protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("testimagefilters"); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); } + SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // this->drawSizeBounds(canvas, 0xFFCCCCCC); static SkImageFilter* (*gFilterProc[])() = { diff --git a/gm/texdata.cpp b/gm/texdata.cpp index 379898a741..99087b56ad 100644 --- a/gm/texdata.cpp +++ b/gm/texdata.cpp @@ -27,17 +27,17 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("texdata"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(2*S, 2*S); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; } + uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* target = canvas->internal_private_accessTopLayerRenderTarget(); GrContext* ctx = canvas->getGrContext(); if (ctx && target) { diff --git a/gm/textblob.cpp b/gm/textblob.cpp index a0340071f7..e802d9bd45 100644 --- a/gm/textblob.cpp +++ b/gm/textblob.cpp @@ -78,15 +78,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("textblob"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { for (unsigned b = 0; b < SK_ARRAY_COUNT(blobConfigs); ++b) { SkAutoTUnref<const SkTextBlob> blob(this->makeBlob(b)); diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp index 7ec75b504d..bf851f6c7f 100644 --- a/gm/textblobshader.cpp +++ b/gm/textblobshader.cpp @@ -27,7 +27,7 @@ public: protected: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { SkPaint p; p.setAntiAlias(true); p.setSubpixelText(true); @@ -73,19 +73,19 @@ protected: SkShader::kRepeat_TileMode)); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkip565_Flag; } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("textblobshader"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint p; p.setStyle(SkPaint::kFill_Style); p.setShader(fShader); diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index 5bdaf9b86e..3fce5db7c1 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -175,15 +175,15 @@ public: TextEffectsGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("texteffects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(460, 680); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->save(); SkPaint paint; diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 8a5953262a..9ea45e13f4 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -30,23 +30,23 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("texture_domain_effect"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { const SkScalar canvasWidth = kDrawPad + (kTargetWidth + 2 * kDrawPad) * GrTextureDomain::kModeCount + kTestPad * GrTextureDomain::kModeCount; return SkISize::Make(SkScalarCeilToInt(canvasWidth), 800); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // This is a GPU-specific GM. return kGPUOnly_Flag; } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fBmp.allocN32Pixels(kTargetWidth, kTargetHeight); SkCanvas canvas(fBmp); canvas.clear(0x00000000); @@ -73,7 +73,7 @@ protected: fBmp.width() + 10.f, fBmp.height() + 10.f), paint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); if (NULL == rt) { return; diff --git a/gm/thinrects.cpp b/gm/thinrects.cpp index 6517fe2796..3facaa9705 100644 --- a/gm/thinrects.cpp +++ b/gm/thinrects.cpp @@ -17,15 +17,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("thinrects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(240, 320); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint white; white.setColor(SK_ColorWHITE); diff --git a/gm/thinstrokedrects.cpp b/gm/thinstrokedrects.cpp index 7e3e399f89..40c23e18e2 100644 --- a/gm/thinstrokedrects.cpp +++ b/gm/thinstrokedrects.cpp @@ -17,15 +17,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("thinstrokedrects"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(240, 320); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setColor(SK_ColorWHITE); diff --git a/gm/tiledscaledbitmap.cpp b/gm/tiledscaledbitmap.cpp index 4bf3b824eb..bc6c61f452 100644 --- a/gm/tiledscaledbitmap.cpp +++ b/gm/tiledscaledbitmap.cpp @@ -31,15 +31,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("tiledscaledbitmap"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1016, 616); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -54,11 +54,11 @@ protected: return bm; } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fBitmap = make_bm(360, 288); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp index 33d1b23471..ad8aa12f4d 100644 --- a/gm/tilemodes.cpp +++ b/gm/tilemodes.cpp @@ -71,14 +71,14 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize; for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypes); i++) { makebm(&fTexture[i], gColorTypes[i], size, size); } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize; @@ -194,7 +194,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -204,7 +204,7 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2); const SkScalar w = SkIntToScalar(gWidth); diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp index 32f640acaa..4edd11586f 100644 --- a/gm/tilemodes_scaled.cpp +++ b/gm/tilemodes_scaled.cpp @@ -75,21 +75,21 @@ protected: #ifdef SK_CPU_ARM64 // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed. - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } #endif SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 760); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize; for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypes); i++) { makebm(&fTexture[i], gColorTypes[i], size, size); } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { float scale = 32.f/kPOTSize; int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize; @@ -213,7 +213,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -223,7 +223,7 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2); const SkScalar w = SkIntToScalar(gWidth); diff --git a/gm/typeface.cpp b/gm/typeface.cpp index c329395b86..1606cef3cb 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -36,15 +36,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("typeface"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkString text("Typefaces are fun!"); SkScalar y = 0; @@ -171,7 +171,7 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString name("typefacestyles"); if (fApplyKerning) { name.append("_kerning"); @@ -179,11 +179,11 @@ protected: return name; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(30)); diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index ebb3c3be5b..dddd79e942 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -31,7 +31,7 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString name("varied_text"); if (fEffectiveClip) { name.append("_clipped"); @@ -46,11 +46,11 @@ protected: return name; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fPaint.setAntiAlias(true); fPaint.setLCDRenderText(fLCD); @@ -111,7 +111,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { for (int i = 0; i < kCnt; ++i) { fPaint.setColor(fColors[i]); fPaint.setTextSize(fPtSizes[i]); @@ -136,7 +136,7 @@ protected: } } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // The aa hairline stroked rects used to visualize the clip draw slightly differently in // quilt mode in dm. return kAsBench_Flag | kSkipTiled_Flag; diff --git a/gm/vertices.cpp b/gm/vertices.cpp index c13fd82d24..bfeb8f5e3c 100644 --- a/gm/vertices.cpp +++ b/gm/vertices.cpp @@ -38,11 +38,11 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { const SkScalar X = 150; const SkScalar Y = 150; @@ -65,7 +65,7 @@ protected: } } - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { SkString name("vertices"); if (0xFF != fAlpha) { name.appendf("_%02X", fAlpha); @@ -73,11 +73,11 @@ protected: return name; } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(600, 600); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { // start with the center of a 3x3 grid static const uint16_t fan[] = { 4, diff --git a/gm/verttext.cpp b/gm/verttext.cpp index 0804e09110..18211e9b8c 100644 --- a/gm/verttext.cpp +++ b/gm/verttext.cpp @@ -49,7 +49,7 @@ public: //SkAutoTUnref<SkTypeface> fFace; protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -85,7 +85,7 @@ protected: canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkScalar x = SkIntToScalar(100); SkScalar y = SkIntToScalar(50); diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp index 5067bbb745..9eba68b164 100644 --- a/gm/verttext2.cpp +++ b/gm/verttext2.cpp @@ -31,7 +31,7 @@ public: } protected: - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { return kSkipTiled_Flag; } @@ -42,7 +42,7 @@ protected: SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { for (int i = 0; i < 3; ++i) { SkPaint paint; paint.setColor(SK_ColorRED); diff --git a/gm/verylargebitmap.cpp b/gm/verylargebitmap.cpp index afb49b916d..00d1b71c3d 100644 --- a/gm/verylargebitmap.cpp +++ b/gm/verylargebitmap.cpp @@ -59,15 +59,15 @@ public: VeryLargeBitmapGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("verylargebitmap"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(500, 600); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { int veryBig = 65*1024; // 64K < size int big = 33*1024; // 32K < size < 64K // smaller than many max texture sizes, but large enough to gpu-tile for memory reasons. diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index 03121413a4..ac5fa5e4b2 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -24,7 +24,7 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("xfermodeimagefilter"); } @@ -62,7 +62,7 @@ protected: } } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(WIDTH, HEIGHT); } @@ -85,12 +85,12 @@ protected: canvas->restore(); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { make_bitmap(); make_checkerboard(); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->clear(0x00000000); SkPaint paint; diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index c8fc1ba876..82d1cef478 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -154,7 +154,7 @@ class XfermodesGM : public GM { } } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { fBG.installPixels(SkImageInfo::Make(2, 2, kARGB_4444_SkColorType, kOpaque_SkAlphaType), gData, 4); @@ -168,15 +168,15 @@ public: XfermodesGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("xfermodes"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(1990, 640); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(SkIntToScalar(10), SkIntToScalar(20)); const struct { diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index b1dd6d8fc0..98e6f3a85c 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -18,15 +18,15 @@ public: Xfermodes2GM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("xfermodes2"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(455, 475); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(SkIntToScalar(10), SkIntToScalar(20)); const SkScalar w = SkIntToScalar(kSize); @@ -86,7 +86,7 @@ protected: } private: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { static const uint32_t kCheckData[] = { SkPackARGB32(0xFF, 0x40, 0x40, 0x40), SkPackARGB32(0xFF, 0xD0, 0xD0, 0xD0), diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index b12004ba54..c385e41d3a 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -27,21 +27,21 @@ public: Xfermodes3GM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("xfermodes3"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(630, 1215); } - virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { + void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { SkPaint bgPaint; bgPaint.setColor(0xFF70D0E0); canvas->drawPaint(bgPaint); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(SkIntToScalar(10), SkIntToScalar(20)); SkPaint labelP; @@ -184,7 +184,7 @@ private: canvas->restore(); } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { static const uint32_t kCheckData[] = { SkPackARGB32(0xFF, 0x40, 0x40, 0x40), SkPackARGB32(0xFF, 0xD0, 0xD0, 0xD0), diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index ed551ff087..3be01cc2c3 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -30,20 +30,20 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("yuv_to_rgb_effect"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(334, 128); } - virtual uint32_t onGetFlags() const SK_OVERRIDE { + uint32_t onGetFlags() const SK_OVERRIDE { // This is a GPU-specific GM. return kGPUOnly_Flag; } - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { SkImageInfo info = SkImageInfo::MakeA8(24, 24); fBmp[0].allocPixels(info); fBmp[1].allocPixels(info); @@ -64,7 +64,7 @@ protected: } } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget(); if (NULL == rt) { return; diff --git a/include/core/SkBBHFactory.h b/include/core/SkBBHFactory.h index 29c40ee951..490a6b5c07 100644 --- a/include/core/SkBBHFactory.h +++ b/include/core/SkBBHFactory.h @@ -24,7 +24,7 @@ public: class SK_API SkRTreeFactory : public SkBBHFactory { public: - virtual SkBBoxHierarchy* operator()(const SkRect& bounds) const SK_OVERRIDE; + SkBBoxHierarchy* operator()(const SkRect& bounds) const SK_OVERRIDE; private: typedef SkBBHFactory INHERITED; }; diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index ec0bffc90f..c28e3f53b2 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -694,7 +694,7 @@ public: */ class HeapAllocator : public Allocator { public: - virtual bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE; + bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE; }; class RLEPixels { diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h index 03fd014d45..a801420584 100644 --- a/include/core/SkBitmapDevice.h +++ b/include/core/SkBitmapDevice.h @@ -35,7 +35,7 @@ public: return Create(info, NULL); } - virtual SkImageInfo imageInfo() const SK_OVERRIDE; + SkImageInfo imageInfo() const SK_OVERRIDE; protected: bool onShouldDisableLCD(const SkPaint&) const SK_OVERRIDE; @@ -45,7 +45,7 @@ protected: and are handling any looping from the paint, and any effects from the DrawFilter. */ - virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; + void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], const SkPaint& paint) SK_OVERRIDE; virtual void drawRect(const SkDraw&, const SkRect& r, @@ -114,7 +114,7 @@ protected: altered. The config/width/height/rowbytes must remain unchanged. @return the device contents as a bitmap */ - virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE; + const SkBitmap& onAccessBitmap() SK_OVERRIDE; SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } // just for subclasses, to assign a custom pixelref @@ -123,15 +123,15 @@ protected: return pr; } - virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE; - virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE; - virtual void* onAccessPixels(SkImageInfo* info, size_t* rowBytes) SK_OVERRIDE; + bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE; + bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE; + void* onAccessPixels(SkImageInfo* info, size_t* rowBytes) SK_OVERRIDE; /** Called when this device is installed into a Canvas. Balanced by a call to unlockPixels() when the device is removed from a Canvas. */ - virtual void lockPixels() SK_OVERRIDE; - virtual void unlockPixels() SK_OVERRIDE; + void lockPixels() SK_OVERRIDE; + void unlockPixels() SK_OVERRIDE; private: friend class SkCanvas; @@ -146,14 +146,14 @@ private: // used to change the backend's pixels (and possibly config/rowbytes) // but cannot change the width/height, so there should be no change to // any clip information. - virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE; + void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE; - virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; - virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; - virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes) SK_OVERRIDE; + SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; + const void* peekPixels(SkImageInfo*, size_t* rowBytes) SK_OVERRIDE; - virtual SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE; + SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE; SkBitmap fBitmap; diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h index 3a28e1e03d..8e0d93f7e8 100644 --- a/include/core/SkComposeShader.h +++ b/include/core/SkComposeShader.h @@ -34,7 +34,7 @@ public: SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode = NULL); virtual ~SkComposeShader(); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class ComposeShaderContext : public SkShader::Context { public: @@ -48,7 +48,7 @@ public: virtual ~ComposeShaderContext(); - virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; private: SkShader::Context* fShaderContextA; @@ -62,15 +62,15 @@ public: SkShader* getShaderB() { return fShaderB; } #endif - virtual bool asACompose(ComposeRec* rec) const SK_OVERRIDE; + bool asACompose(ComposeRec* rec) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader) protected: SkComposeShader(SkReadBuffer& ); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; private: SkShader* fShaderA; diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index e45627dbcc..1868176924 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -49,7 +49,7 @@ class SkWriteBuffer; static SkFlattenable* CreateProc(SkReadBuffer&); \ friend class SkPrivateEffectInitializer; \ public: \ - virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } + Factory getFactory() const SK_OVERRIDE { return CreateProc; } /** For SkFlattenable derived objects with a valid type This macro should only be used in base class objects in core diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 42e2d7c33f..a65a24c3ee 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -242,7 +242,7 @@ protected: */ explicit SkImageFilter(int inputCount, SkReadBuffer& rb); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; /** * This is the virtual which should be overridden by the derived class diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h index 63ed19ae3c..259692da64 100644 --- a/include/core/SkMallocPixelRef.h +++ b/include/core/SkMallocPixelRef.h @@ -88,9 +88,9 @@ protected: bool ownPixels); virtual ~SkMallocPixelRef(); - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; - virtual void onUnlockPixels() SK_OVERRIDE; - virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE; + bool onNewLockPixels(LockRec*) SK_OVERRIDE; + void onUnlockPixels() SK_OVERRIDE; + size_t getAllocatedSizeInBytes() const SK_OVERRIDE; private: void* fStorage; diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h index 2a6e3a9c22..0675e97058 100644 --- a/include/core/SkPathEffect.h +++ b/include/core/SkPathEffect.h @@ -157,7 +157,7 @@ public: protected: SkPairPathEffect(SkPathEffect* pe0, SkPathEffect* pe1); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; // these are visible to our subclasses SkPathEffect* fPE0, *fPE1; diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 7cfb53619a..f8de276c7b 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -482,7 +482,7 @@ public: SK_DEFINE_FLATTENABLE_TYPE(SkShader) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; bool computeTotalInverse(const ContextRec&, SkMatrix* totalInverse) const; diff --git a/include/core/SkStream.h b/include/core/SkStream.h index 913286bdb4..2d5969853a 100644 --- a/include/core/SkStream.h +++ b/include/core/SkStream.h @@ -133,39 +133,39 @@ private: /** SkStreamRewindable is a SkStream for which rewind and duplicate are required. */ class SK_API SkStreamRewindable : public SkStream { public: - virtual bool rewind() SK_OVERRIDE = 0; - virtual SkStreamRewindable* duplicate() const SK_OVERRIDE = 0; + bool rewind() SK_OVERRIDE = 0; + SkStreamRewindable* duplicate() const SK_OVERRIDE = 0; }; /** SkStreamSeekable is a SkStreamRewindable for which position, seek, move, and fork are required. */ class SK_API SkStreamSeekable : public SkStreamRewindable { public: - virtual SkStreamSeekable* duplicate() const SK_OVERRIDE = 0; + SkStreamSeekable* duplicate() const SK_OVERRIDE = 0; - virtual bool hasPosition() const SK_OVERRIDE { return true; } - virtual size_t getPosition() const SK_OVERRIDE = 0; - virtual bool seek(size_t position) SK_OVERRIDE = 0; - virtual bool move(long offset) SK_OVERRIDE = 0; - virtual SkStreamSeekable* fork() const SK_OVERRIDE = 0; + bool hasPosition() const SK_OVERRIDE { return true; } + size_t getPosition() const SK_OVERRIDE = 0; + bool seek(size_t position) SK_OVERRIDE = 0; + bool move(long offset) SK_OVERRIDE = 0; + SkStreamSeekable* fork() const SK_OVERRIDE = 0; }; /** SkStreamAsset is a SkStreamSeekable for which getLength is required. */ class SK_API SkStreamAsset : public SkStreamSeekable { public: - virtual SkStreamAsset* duplicate() const SK_OVERRIDE = 0; - virtual SkStreamAsset* fork() const SK_OVERRIDE = 0; + SkStreamAsset* duplicate() const SK_OVERRIDE = 0; + SkStreamAsset* fork() const SK_OVERRIDE = 0; - virtual bool hasLength() const SK_OVERRIDE { return true; } - virtual size_t getLength() const SK_OVERRIDE = 0; + bool hasLength() const SK_OVERRIDE { return true; } + size_t getLength() const SK_OVERRIDE = 0; }; /** SkStreamMemory is a SkStreamAsset for which getMemoryBase is required. */ class SK_API SkStreamMemory : public SkStreamAsset { public: - virtual SkStreamMemory* duplicate() const SK_OVERRIDE = 0; - virtual SkStreamMemory* fork() const SK_OVERRIDE = 0; + SkStreamMemory* duplicate() const SK_OVERRIDE = 0; + SkStreamMemory* fork() const SK_OVERRIDE = 0; - virtual const void* getMemoryBase() SK_OVERRIDE = 0; + const void* getMemoryBase() SK_OVERRIDE = 0; }; class SK_API SkWStream : SkNoncopyable { @@ -248,20 +248,20 @@ public: */ void setPath(const char path[]); - virtual size_t read(void* buffer, size_t size) SK_OVERRIDE; - virtual bool isAtEnd() const SK_OVERRIDE; + size_t read(void* buffer, size_t size) SK_OVERRIDE; + bool isAtEnd() const SK_OVERRIDE; - virtual bool rewind() SK_OVERRIDE; - virtual SkStreamAsset* duplicate() const SK_OVERRIDE; + bool rewind() SK_OVERRIDE; + SkStreamAsset* duplicate() const SK_OVERRIDE; - virtual size_t getPosition() const SK_OVERRIDE; - virtual bool seek(size_t position) SK_OVERRIDE; - virtual bool move(long offset) SK_OVERRIDE; - virtual SkStreamAsset* fork() const SK_OVERRIDE; + size_t getPosition() const SK_OVERRIDE; + bool seek(size_t position) SK_OVERRIDE; + bool move(long offset) SK_OVERRIDE; + SkStreamAsset* fork() const SK_OVERRIDE; - virtual size_t getLength() const SK_OVERRIDE; + size_t getLength() const SK_OVERRIDE; - virtual const void* getMemoryBase() SK_OVERRIDE; + const void* getMemoryBase() SK_OVERRIDE; private: SkFILE* fFILE; @@ -320,20 +320,20 @@ public: const void* getAtPos(); size_t peek() const { return fOffset; } - virtual size_t read(void* buffer, size_t size) SK_OVERRIDE; - virtual bool isAtEnd() const SK_OVERRIDE; + size_t read(void* buffer, size_t size) SK_OVERRIDE; + bool isAtEnd() const SK_OVERRIDE; - virtual bool rewind() SK_OVERRIDE; - virtual SkMemoryStream* duplicate() const SK_OVERRIDE; + bool rewind() SK_OVERRIDE; + SkMemoryStream* duplicate() const SK_OVERRIDE; - virtual size_t getPosition() const SK_OVERRIDE; - virtual bool seek(size_t position) SK_OVERRIDE; - virtual bool move(long offset) SK_OVERRIDE; - virtual SkMemoryStream* fork() const SK_OVERRIDE; + size_t getPosition() const SK_OVERRIDE; + bool seek(size_t position) SK_OVERRIDE; + bool move(long offset) SK_OVERRIDE; + SkMemoryStream* fork() const SK_OVERRIDE; - virtual size_t getLength() const SK_OVERRIDE; + size_t getLength() const SK_OVERRIDE; - virtual const void* getMemoryBase() SK_OVERRIDE; + const void* getMemoryBase() SK_OVERRIDE; private: SkData* fData; @@ -355,9 +355,9 @@ public: */ bool isValid() const { return fFILE != NULL; } - virtual bool write(const void* buffer, size_t size) SK_OVERRIDE; - virtual void flush() SK_OVERRIDE; - virtual size_t bytesWritten() const SK_OVERRIDE; + bool write(const void* buffer, size_t size) SK_OVERRIDE; + void flush() SK_OVERRIDE; + size_t bytesWritten() const SK_OVERRIDE; private: SkFILE* fFILE; @@ -370,8 +370,8 @@ public: SK_DECLARE_INST_COUNT(SkMemoryWStream) SkMemoryWStream(void* buffer, size_t size); - virtual bool write(const void* buffer, size_t size) SK_OVERRIDE; - virtual size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } + bool write(const void* buffer, size_t size) SK_OVERRIDE; + size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } private: char* fBuffer; @@ -388,8 +388,8 @@ public: SkDynamicMemoryWStream(); virtual ~SkDynamicMemoryWStream(); - virtual bool write(const void* buffer, size_t size) SK_OVERRIDE; - virtual size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } + bool write(const void* buffer, size_t size) SK_OVERRIDE; + size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } // random access write // modifies stream and returns true if offset + size is less than or equal to getOffset() bool write(const void* buffer, size_t offset, size_t size); @@ -434,9 +434,9 @@ public: SK_DECLARE_INST_COUNT(SkDebugWStream) // overrides - virtual bool write(const void* buffer, size_t size) SK_OVERRIDE; - virtual void newline() SK_OVERRIDE; - virtual size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } + bool write(const void* buffer, size_t size) SK_OVERRIDE; + void newline() SK_OVERRIDE; + size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } private: size_t fBytesWritten; diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 72ebb093c2..39923c59b7 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -138,7 +138,7 @@ inline void operator delete(void* p) { #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const; #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const; #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const = 0; - #define SK_TO_STRING_OVERRIDE() virtual void toString(SkString* str) const SK_OVERRIDE; + #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const SK_OVERRIDE; #endif template <bool> diff --git a/include/core/SkWeakRefCnt.h b/include/core/SkWeakRefCnt.h index 210dcc9f1c..3eb8ea5ca5 100644 --- a/include/core/SkWeakRefCnt.h +++ b/include/core/SkWeakRefCnt.h @@ -147,7 +147,7 @@ private: on the object and releases the implicit weak reference held collectively by the strong references. */ - virtual void internal_dispose() const SK_OVERRIDE { + void internal_dispose() const SK_OVERRIDE { weak_dispose(); weak_unref(); } diff --git a/include/device/xps/SkXPSDevice.h b/include/device/xps/SkXPSDevice.h index 8fa7e51626..59cc113718 100644 --- a/include/device/xps/SkXPSDevice.h +++ b/include/device/xps/SkXPSDevice.h @@ -70,7 +70,7 @@ public: virtual bool endPortfolio(); protected: - virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; + void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; virtual void drawPoints( const SkDraw&, @@ -141,7 +141,7 @@ protected: int x, int y, const SkPaint& paint) SK_OVERRIDE; - virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE; + bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE; private: class TypefaceUse : ::SkNoncopyable { @@ -317,7 +317,7 @@ private: const SkVector& ppuScale, IXpsOMPath* shadedPath); - virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; // Disable the default copy and assign implementation. SkXPSDevice(const SkXPSDevice&); diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index 9ba11b0812..7a0ca2ec63 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -64,11 +64,11 @@ public: protected: SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Style); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; // overrides from Sk1DPathEffect - virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE; - virtual SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const SK_OVERRIDE; + SkScalar begin(SkScalar contourLength) const SK_OVERRIDE; + SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const SK_OVERRIDE; private: SkPath fPath; // copied from constructor diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 404bf0aa6a..bd905e1ba6 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -14,7 +14,7 @@ class SK_API Sk2DPathEffect : public SkPathEffect { public: - virtual bool filterPath(SkPath*, const SkPath&, SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + bool filterPath(SkPath*, const SkPath&, SkStrokeRec*, const SkRect*) const SK_OVERRIDE; protected: /** New virtual, to be overridden by subclasses. @@ -37,7 +37,7 @@ protected: // protected so that subclasses can call this during unflattening explicit Sk2DPathEffect(const SkMatrix& mat); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkMatrix fMatrix, fInverse; @@ -65,9 +65,9 @@ public: protected: SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix) : Sk2DPathEffect(matrix), fWidth(width) {} - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE; + void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE; private: SkScalar fWidth; @@ -89,9 +89,9 @@ public: protected: SkPath2DPathEffect(const SkMatrix&, const SkPath&); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual void next(const SkPoint&, int u, int v, SkPath*) const SK_OVERRIDE; + void next(const SkPoint&, int u, int v, SkPath*) const SK_OVERRIDE; private: SkPath fPath; diff --git a/include/effects/SkArcToPathEffect.h b/include/effects/SkArcToPathEffect.h index 6b6e2c721c..ca8819c59f 100644 --- a/include/effects/SkArcToPathEffect.h +++ b/include/effects/SkArcToPathEffect.h @@ -28,7 +28,7 @@ public: protected: explicit SkArcToPathEffect(SkScalar radius); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkScalar fRadius; diff --git a/include/effects/SkAvoidXfermode.h b/include/effects/SkAvoidXfermode.h index c79227f762..fa34154295 100644 --- a/include/effects/SkAvoidXfermode.h +++ b/include/effects/SkAvoidXfermode.h @@ -54,7 +54,7 @@ public: protected: SkAvoidXfermode(SkColor opColor, U8CPU tolerance, Mode mode); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkColor fOpColor; diff --git a/include/effects/SkBitmapSource.h b/include/effects/SkBitmapSource.h index cf57f8012e..327ff6477e 100644 --- a/include/effects/SkBitmapSource.h +++ b/include/effects/SkBitmapSource.h @@ -20,7 +20,7 @@ public: const SkRect& dstRect) { return SkNEW_ARGS(SkBitmapSource, (bitmap, srcRect, dstRect)); } - virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource) @@ -28,7 +28,7 @@ public: protected: explicit SkBitmapSource(const SkBitmap& bitmap); SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h index cb912c1a85..5e6b9df502 100644 --- a/include/effects/SkBlurDrawLooper.h +++ b/include/effects/SkBlurDrawLooper.h @@ -42,9 +42,9 @@ public: virtual ~SkBlurDrawLooper(); - virtual SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE; + SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE; - virtual size_t contextSize() const SK_OVERRIDE { return sizeof(BlurDrawLooperContext); } + size_t contextSize() const SK_OVERRIDE { return sizeof(BlurDrawLooperContext); } SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurDrawLooper) @@ -53,9 +53,9 @@ protected: SkBlurDrawLooper(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy, uint32_t flags); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual bool asABlurShadow(BlurShadowRec*) const SK_OVERRIDE; + bool asABlurShadow(BlurShadowRec*) const SK_OVERRIDE; private: SkMaskFilter* fBlur; @@ -74,7 +74,7 @@ private: public: explicit BlurDrawLooperContext(const SkBlurDrawLooper* looper); - virtual bool next(SkCanvas* canvas, SkPaint* paint) SK_OVERRIDE; + bool next(SkCanvas* canvas, SkPaint* paint) SK_OVERRIDE; private: const SkBlurDrawLooper* fLooper; diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h index f2a3075593..d6b506621d 100644 --- a/include/effects/SkBlurImageFilter.h +++ b/include/effects/SkBlurImageFilter.h @@ -20,7 +20,7 @@ public: return SkNEW_ARGS(SkBlurImageFilter, (sigmaX, sigmaY, input, cropRect, uniqueID)); } - virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; + void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurImageFilter) @@ -31,7 +31,7 @@ protected: SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; diff --git a/include/effects/SkColorCubeFilter.h b/include/effects/SkColorCubeFilter.h index ebd5e5fbb5..65df345b07 100644 --- a/include/effects/SkColorCubeFilter.h +++ b/include/effects/SkColorCubeFilter.h @@ -20,11 +20,11 @@ public: */ static SkColorFilter* Create(SkData* cubeData, int cubeDimension); - virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; - virtual uint32_t getFlags() const SK_OVERRIDE; + void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; + GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; #endif SK_TO_STRING_OVERRIDE() @@ -32,7 +32,7 @@ public: protected: SkColorCubeFilter(SkData* cubeData, int cubeDimension); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: /** The cache is initialized on-demand when getProcessingLuts is called. diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h index facbfda106..97203d842c 100644 --- a/include/effects/SkColorFilterImageFilter.h +++ b/include/effects/SkColorFilterImageFilter.h @@ -24,12 +24,12 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; - virtual bool asColorFilter(SkColorFilter**) const SK_OVERRIDE; + bool asColorFilter(SkColorFilter**) const SK_OVERRIDE; private: SkColorFilterImageFilter(SkColorFilter* cf, diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 379ca5755a..b5ab689002 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -21,12 +21,12 @@ public: } // overrides from SkColorFilter - virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; - virtual void filterSpan16(const uint16_t src[], int count, uint16_t[]) const SK_OVERRIDE; - virtual uint32_t getFlags() const SK_OVERRIDE; - virtual bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE; + void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; + void filterSpan16(const uint16_t src[], int count, uint16_t[]) const SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; + bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; + GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; #endif struct State { @@ -41,7 +41,7 @@ public: protected: explicit SkColorMatrixFilter(const SkColorMatrix&); explicit SkColorMatrixFilter(const SkScalar array[20]); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkColorMatrix fMatrix; diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h index 389ab824ac..dccbd6ee5b 100644 --- a/include/effects/SkComposeImageFilter.h +++ b/include/effects/SkComposeImageFilter.h @@ -35,7 +35,7 @@ protected: } virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; - virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; + bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; private: typedef SkImageFilter INHERITED; diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h index 6b75da66e3..c90aaec16b 100644 --- a/include/effects/SkCornerPathEffect.h +++ b/include/effects/SkCornerPathEffect.h @@ -32,7 +32,7 @@ public: protected: explicit SkCornerPathEffect(SkScalar radius); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkScalar fRadius; diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index 210b378fb2..ee9c553b6c 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -49,13 +49,13 @@ public: const SkStrokeRec&, const SkMatrix&, const SkRect*) const SK_OVERRIDE; - virtual DashType asADash(DashInfo* info) const SK_OVERRIDE; + DashType asADash(DashInfo* info) const SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDashPathEffect) protected: SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkScalar* fIntervals; diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h index 18c7b4bdf8..bbb09a80df 100644 --- a/include/effects/SkDiscretePathEffect.h +++ b/include/effects/SkDiscretePathEffect.h @@ -45,7 +45,7 @@ protected: SkDiscretePathEffect(SkScalar segLength, SkScalar deviation, uint32_t seedAssist); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkScalar fSegLength, fPerterb; diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h index dd11582bdb..e55b324ce9 100644 --- a/include/effects/SkDisplacementMapEffect.h +++ b/include/effects/SkDisplacementMapEffect.h @@ -37,13 +37,13 @@ public: const Context& ctx, SkBitmap* dst, SkIPoint* offset) const SK_OVERRIDE; - virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, SkIRect* dst) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } + bool canFilterImageGPU() const SK_OVERRIDE { return true; } virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; #endif @@ -56,7 +56,7 @@ protected: SkScalar scale, SkImageFilter* inputs[2], const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: ChannelSelectorType fXChannelSelector; diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h index e4c192bc13..5eb64094e2 100644 --- a/include/effects/SkDropShadowImageFilter.h +++ b/include/effects/SkDropShadowImageFilter.h @@ -48,7 +48,7 @@ public: shadowMode, NULL, NULL, 0)); } - virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; + void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter) @@ -56,8 +56,8 @@ protected: SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor, ShadowMode shadowMode, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, SkIRect* dst) const SK_OVERRIDE; diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index 8b6a3c3ac2..3fa15fd5c3 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -27,7 +27,7 @@ public: // overrides from SkMaskFilter // This method is not exported to java. - virtual SkMask::Format getFormat() const SK_OVERRIDE; + SkMask::Format getFormat() const SK_OVERRIDE; // This method is not exported to java. virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, SkIPoint* margin) const SK_OVERRIDE; @@ -37,7 +37,7 @@ public: protected: SkEmbossMaskFilter(SkScalar blurSigma, const Light& light); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: Light fLight; diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h index d21e399762..9aac01e50d 100644 --- a/include/effects/SkLayerDrawLooper.h +++ b/include/effects/SkLayerDrawLooper.h @@ -73,21 +73,21 @@ public: LayerInfo(); }; - virtual SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE; + SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE; - virtual size_t contextSize() const SK_OVERRIDE { return sizeof(LayerDrawLooperContext); } + size_t contextSize() const SK_OVERRIDE { return sizeof(LayerDrawLooperContext); } - virtual bool asABlurShadow(BlurShadowRec* rec) const SK_OVERRIDE; + bool asABlurShadow(BlurShadowRec* rec) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() - virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } + Factory getFactory() const SK_OVERRIDE { return CreateProc; } static SkFlattenable* CreateProc(SkReadBuffer& buffer); protected: SkLayerDrawLooper(); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: struct Rec { @@ -105,7 +105,7 @@ private: explicit LayerDrawLooperContext(const SkLayerDrawLooper* looper); protected: - virtual bool next(SkCanvas*, SkPaint* paint) SK_OVERRIDE; + bool next(SkCanvas*, SkPaint* paint) SK_OVERRIDE; private: Rec* fCurrRec; diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h index 02dfc35332..6ea873cdc9 100644 --- a/include/effects/SkLayerRasterizer.h +++ b/include/effects/SkLayerRasterizer.h @@ -69,7 +69,7 @@ public: protected: SkLayerRasterizer(); SkLayerRasterizer(SkDeque* layers); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; // override from SkRasterizer virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix, diff --git a/include/effects/SkLerpXfermode.h b/include/effects/SkLerpXfermode.h index 923e840c5d..4fcc06b554 100644 --- a/include/effects/SkLerpXfermode.h +++ b/include/effects/SkLerpXfermode.h @@ -32,7 +32,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLerpXfermode) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkLerpXfermode(unsigned scale256); diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h index 323da88ec8..d06af93cf7 100644 --- a/include/effects/SkLightingImageFilter.h +++ b/include/effects/SkLightingImageFilter.h @@ -75,7 +75,7 @@ protected: SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; const SkLight* light() const { return fLight.get(); } SkScalar surfaceScale() const { return fSurfaceScale; } diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index ae666c0bca..c7bb2db8bc 100644 --- a/include/effects/SkLumaColorFilter.h +++ b/include/effects/SkLumaColorFilter.h @@ -25,17 +25,17 @@ class SK_API SkLumaColorFilter : public SkColorFilter { public: static SkColorFilter* Create(); - virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; + void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; + GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; #endif SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLumaColorFilter) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkLumaColorFilter(); diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 9e69dddc39..a9cc66a2ae 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -21,7 +21,7 @@ public: protected: SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset, SkImageFilter* input); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index e09ac944cb..327f98f139 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -77,11 +77,11 @@ protected: SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; - virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; + bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; #if SK_SUPPORT_GPU diff --git a/include/effects/SkMatrixImageFilter.h b/include/effects/SkMatrixImageFilter.h index 0f7ed0bb5f..7d855b777f 100644 --- a/include/effects/SkMatrixImageFilter.h +++ b/include/effects/SkMatrixImageFilter.h @@ -34,7 +34,7 @@ public: uint32_t uniqueID = 0); virtual ~SkMatrixImageFilter(); - virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; + void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixImageFilter) @@ -44,7 +44,7 @@ protected: SkPaint::FilterLevel, SkImageFilter* input, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index ba580f1c5b..ba2849b778 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -39,7 +39,7 @@ protected: const SkXfermode::Mode modes[], const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index aad7cb5776..901955bee6 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -15,8 +15,8 @@ class SK_API SkMorphologyImageFilter : public SkImageFilter { public: - virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; - virtual bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const SK_OVERRIDE; /** * All morphology procs have the same signature: src is the source buffer, dst the @@ -34,9 +34,9 @@ protected: bool filterImageGeneric(Proc procX, Proc procY, Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const; - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } + bool canFilterImageGPU() const SK_OVERRIDE { return true; } bool filterImageGPUGeneric(bool dilate, Proxy* proxy, const SkBitmap& src, const Context& ctm, SkBitmap* result, SkIPoint* offset) const; diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h index de5a631162..ed2878a212 100644 --- a/include/effects/SkOffsetImageFilter.h +++ b/include/effects/SkOffsetImageFilter.h @@ -23,17 +23,17 @@ public: } return SkNEW_ARGS(SkOffsetImageFilter, (dx, dy, input, cropRect, uniqueID)); } - virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter) protected: SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; - virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; + bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; private: SkVector fOffset; diff --git a/include/effects/SkPaintFlagsDrawFilter.h b/include/effects/SkPaintFlagsDrawFilter.h index cb2a8b7e95..0004057e3f 100644 --- a/include/effects/SkPaintFlagsDrawFilter.h +++ b/include/effects/SkPaintFlagsDrawFilter.h @@ -14,7 +14,7 @@ class SK_API SkPaintFlagsDrawFilter : public SkDrawFilter { public: SkPaintFlagsDrawFilter(uint32_t clearFlags, uint32_t setFlags); - virtual bool filter(SkPaint*, Type) SK_OVERRIDE; + bool filter(SkPaint*, Type) SK_OVERRIDE; private: uint16_t fClearFlags; // user specified diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 3d37de80dd..b318ef1cd0 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -72,15 +72,15 @@ public: } - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class PerlinNoiseShaderContext : public SkShader::Context { public: PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&); virtual ~PerlinNoiseShaderContext(); - virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; private: SkPMColor shade(const SkPoint& point, StitchData& stitchData) const; @@ -104,8 +104,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX, diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h index a6b82258e5..e6579eabe7 100644 --- a/include/effects/SkPictureImageFilter.h +++ b/include/effects/SkPictureImageFilter.h @@ -65,7 +65,7 @@ protected: * SkReadBuffer::setBitmapDecoder() before calling this constructor. * @param SkReadBuffer Serialized picture data. */ - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h index 275bc17559..ccc61458cb 100644 --- a/include/effects/SkPixelXorXfermode.h +++ b/include/effects/SkPixelXorXfermode.h @@ -26,10 +26,10 @@ public: protected: explicit SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {} - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; // override from SkXfermode - virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE; + SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE; private: SkColor fOpColor; diff --git a/include/effects/SkRectShaderImageFilter.h b/include/effects/SkRectShaderImageFilter.h index dbc8a081cf..a2d42b34b4 100644 --- a/include/effects/SkRectShaderImageFilter.h +++ b/include/effects/SkRectShaderImageFilter.h @@ -35,7 +35,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRectShaderImageFilter) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h index ec071d0e6a..444ca019b4 100644 --- a/include/effects/SkTableMaskFilter.h +++ b/include/effects/SkTableMaskFilter.h @@ -45,7 +45,7 @@ public: return SkNEW_ARGS(SkTableMaskFilter, (table)); } - virtual SkMask::Format getFormat() const SK_OVERRIDE; + SkMask::Format getFormat() const SK_OVERRIDE; virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*) const SK_OVERRIDE; @@ -55,7 +55,7 @@ public: protected: SkTableMaskFilter(); explicit SkTableMaskFilter(const uint8_t table[256]); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: uint8_t fTable[256]; diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h index a460b3238f..5e375aea72 100644 --- a/include/effects/SkTestImageFilters.h +++ b/include/effects/SkTestImageFilters.h @@ -24,7 +24,7 @@ public: protected: SkDownSampleImageFilter(SkScalar scale, SkImageFilter* input) : INHERITED(1, &input), fScale(scale) {} - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h index 3e1411ce83..82673d65e0 100644 --- a/include/effects/SkTileImageFilter.h +++ b/include/effects/SkTileImageFilter.h @@ -34,7 +34,7 @@ protected: SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input, uint32_t uniqueID) : INHERITED(1, &input, NULL, uniqueID), fSrcRect(srcRect), fDstRect(dstRect) {} - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; private: SkRect fSrcRect; diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h index 96de80abe5..254338c579 100644 --- a/include/effects/SkTransparentShader.h +++ b/include/effects/SkTransparentShader.h @@ -14,16 +14,16 @@ class SK_API SkTransparentShader : public SkShader { public: SkTransparentShader() {} - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class TransparentShaderContext : public SkShader::Context { public: TransparentShaderContext(const SkTransparentShader& shader, const ContextRec&); virtual ~TransparentShaderContext(); - virtual uint32_t getFlags() const SK_OVERRIDE; - virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; private: const SkBitmap* fDevice; @@ -35,10 +35,10 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader) protected: - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; // we don't need to flatten anything at all - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE {} + void flatten(SkWriteBuffer&) const SK_OVERRIDE {} private: typedef SkShader INHERITED; diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 1b2a7636fa..47c44b87e1 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -40,7 +40,7 @@ public: SkBitmap* dst, SkIPoint* offset) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual bool canFilterImageGPU() const SK_OVERRIDE; + bool canFilterImageGPU() const SK_OVERRIDE; virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; #endif @@ -48,7 +48,7 @@ public: protected: SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* inputs[2], const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: SkXfermode* fMode; diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h index 6b5a961f8b..4c771a46ca 100644 --- a/include/gpu/GrRenderTarget.h +++ b/include/gpu/GrRenderTarget.h @@ -25,8 +25,8 @@ public: SK_DECLARE_INST_COUNT(GrRenderTarget) // GrSurface overrides - virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE { return this; } - virtual const GrRenderTarget* asRenderTarget() const SK_OVERRIDE { return this; } + GrRenderTarget* asRenderTarget() SK_OVERRIDE { return this; } + const GrRenderTarget* asRenderTarget() const SK_OVERRIDE { return this; } // GrRenderTarget /** @@ -118,8 +118,8 @@ protected: } // override of GrResource - virtual void onAbandon() SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; private: GrStencilBuffer* fStencilBuffer; diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h index 4989a5e8a0..612fef4094 100644 --- a/include/gpu/GrTexture.h +++ b/include/gpu/GrTexture.h @@ -19,8 +19,8 @@ class GrTexturePriv; class GrTexture : virtual public GrSurface { public: - virtual GrTexture* asTexture() SK_OVERRIDE { return this; } - virtual const GrTexture* asTexture() const SK_OVERRIDE { return this; } + GrTexture* asTexture() SK_OVERRIDE { return this; } + const GrTexture* asTexture() const SK_OVERRIDE { return this; } /** * Return the native ID or handle to the texture, depending on the @@ -51,7 +51,7 @@ protected: void validateDesc() const; private: - virtual size_t onGpuMemorySize() const SK_OVERRIDE; + size_t onGpuMemorySize() const SK_OVERRIDE; void dirtyMipMaps(bool mipMapsDirty); enum MipMapsStatus { diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h index 96125ba111..4eab59c7a6 100644 --- a/include/gpu/SkGrPixelRef.h +++ b/include/gpu/SkGrPixelRef.h @@ -25,9 +25,9 @@ public: virtual ~SkROLockPixelsPixelRef(); protected: - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; - virtual void onUnlockPixels() SK_OVERRIDE; - virtual bool onLockPixelsAreWritable() const SK_OVERRIDE; // return false; + bool onNewLockPixels(LockRec*) SK_OVERRIDE; + void onUnlockPixels() SK_OVERRIDE; + bool onLockPixelsAreWritable() const SK_OVERRIDE; // return false; private: SkBitmap fBitmap; @@ -47,11 +47,11 @@ public: virtual ~SkGrPixelRef(); // override from SkPixelRef - virtual GrTexture* getTexture() SK_OVERRIDE; + GrTexture* getTexture() SK_OVERRIDE; protected: // overrides from SkPixelRef - virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subset) SK_OVERRIDE; + bool onReadPixels(SkBitmap* dst, const SkIRect* subset) SK_OVERRIDE; virtual SkPixelRef* deepCopy(SkColorType, SkColorProfileType, const SkIRect* subset) SK_OVERRIDE; diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h index ceaced539b..57456c2f51 100644 --- a/include/gpu/gl/SkGLContext.h +++ b/include/gpu/gl/SkGLContext.h @@ -19,7 +19,7 @@ class SK_API SkGLContext : public SkRefCnt { public: SK_DECLARE_INST_COUNT(SkGLContext) - virtual ~SkGLContext() SK_OVERRIDE; + ~SkGLContext() SK_OVERRIDE; bool isValid() const { return NULL != gl(); } diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h index 495354a0be..66689f2872 100644 --- a/include/pdf/SkPDFDevice.h +++ b/include/pdf/SkPDFDevice.h @@ -207,11 +207,11 @@ public: } protected: - virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE { + const SkBitmap& onAccessBitmap() SK_OVERRIDE { return fLegacyBitmap; } - virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; + SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; private: // TODO(vandebo): push most of SkPDFDevice's state into a core object in @@ -257,7 +257,7 @@ private: const SkRegion& existingClipRegion); // override from SkBaseDevice - virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; void init(); void cleanUp(bool clearFontUsage); diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index 573c7eb540..ad89b71ab5 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -30,11 +30,11 @@ public: { } protected: - virtual int onCountFamilies() const SK_OVERRIDE; - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE; - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE; + int onCountFamilies() const SK_OVERRIDE; + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE; + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE; - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE; + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE; virtual SkTypeface* onMatchFamilyStyle(const char familyName[], const SkFontStyle& fontStyle) const SK_OVERRIDE; @@ -48,9 +48,9 @@ protected: virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontStyle) const SK_OVERRIDE; - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE; - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE; - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE; + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE; + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE; + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE; virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const SK_OVERRIDE; diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h index 0527198d77..d3ab73f675 100644 --- a/include/utils/SkDeferredCanvas.h +++ b/include/utils/SkDeferredCanvas.h @@ -143,17 +143,17 @@ public: */ void silentFlush(); - virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; + SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; protected: - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], @@ -192,12 +192,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; public: class NotificationClient { @@ -232,7 +232,7 @@ public: }; protected: - virtual SkCanvas* canvasForDrawIter() SK_OVERRIDE; + SkCanvas* canvasForDrawIter() SK_OVERRIDE; SkDeferredDevice* getDeferredDevice() const; private: diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h index d8f50d0521..c6b20ebca9 100644 --- a/include/utils/SkDumpCanvas.h +++ b/include/utils/SkDumpCanvas.h @@ -75,19 +75,19 @@ public: int getNestLevel() const { return fNestLevel; } - virtual void beginCommentGroup(const char* description) SK_OVERRIDE; - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; - virtual void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) SK_OVERRIDE; + void addComment(const char* kywd, const char* value) SK_OVERRIDE; + void endCommentGroup() SK_OVERRIDE; protected: - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], @@ -123,12 +123,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; static const char* EdgeStyleToAAString(ClipEdgeStyle edgeStyle); diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h index 8c535226f2..e3541f2276 100644 --- a/include/utils/SkLuaCanvas.h +++ b/include/utils/SkLuaCanvas.h @@ -21,14 +21,14 @@ public: virtual ~SkLuaCanvas(); protected: - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], @@ -61,12 +61,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; private: lua_State* fL; diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h index b547fe524a..02d715b50a 100644 --- a/include/utils/SkNWayCanvas.h +++ b/include/utils/SkNWayCanvas.h @@ -23,23 +23,23 @@ public: /////////////////////////////////////////////////////////////////////////// // These are forwarded to the N canvases we're referencing - virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; + SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; - virtual void beginCommentGroup(const char* description) SK_OVERRIDE; - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; - virtual void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) SK_OVERRIDE; + void addComment(const char* kywd, const char* value) SK_OVERRIDE; + void endCommentGroup() SK_OVERRIDE; protected: SkTDArray<SkCanvas*> fList; - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], @@ -75,12 +75,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; class Iter; diff --git a/include/utils/SkPictureUtils.h b/include/utils/SkPictureUtils.h index 9bdf6f69a1..80d8b81e1f 100644 --- a/include/utils/SkPictureUtils.h +++ b/include/utils/SkPictureUtils.h @@ -47,14 +47,14 @@ public: // and rects. class SkPixelRefsAndRectsList : public SkPixelRefContainer { public: - virtual void add(SkPixelRef* pr, const SkRect& rect) SK_OVERRIDE { + void add(SkPixelRef* pr, const SkRect& rect) SK_OVERRIDE { PixelRefAndRect *dst = fArray.append(); dst->fPixelRef = pr; dst->fRect = rect; } - virtual void query(const SkRect& queryRect, SkTDArray<SkPixelRef*> *result) SK_OVERRIDE { + void query(const SkRect& queryRect, SkTDArray<SkPixelRef*> *result) SK_OVERRIDE { for (int i = 0; i < fArray.count(); ++i) { if (SkRect::Intersects(fArray[i].fRect, queryRect)) { *result->append() = fArray[i].fPixelRef; diff --git a/include/utils/SkProxyCanvas.h b/include/utils/SkProxyCanvas.h index 2a2d7746f5..ac1ba99087 100644 --- a/include/utils/SkProxyCanvas.h +++ b/include/utils/SkProxyCanvas.h @@ -26,21 +26,21 @@ public: SkCanvas* getProxy() const { return fProxy; } void setProxy(SkCanvas* proxy); - virtual void beginCommentGroup(const char* description) SK_OVERRIDE; - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; - virtual void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) SK_OVERRIDE; + void addComment(const char* kywd, const char* value) SK_OVERRIDE; + void endCommentGroup() SK_OVERRIDE; - virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; + SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; protected: - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], @@ -76,12 +76,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; private: SkCanvas* fProxy; diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h index 8a55ef455e..525123c3d3 100644 --- a/include/views/SkOSWindow_Unix.h +++ b/include/views/SkOSWindow_Unix.h @@ -53,7 +53,7 @@ public: protected: // Overridden from from SkWindow: - virtual void onSetTitle(const char title[]) SK_OVERRIDE; + void onSetTitle(const char title[]) SK_OVERRIDE; private: enum NextXEventResult { diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 4ba65bd894..1e21bad753 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -75,7 +75,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect) protected: - virtual void begin(const SkIRect& uvBounds, SkPath* dst) const SK_OVERRIDE { + void begin(const SkIRect& uvBounds, SkPath* dst) const SK_OVERRIDE { if (fPts) { fPts->reset(); } @@ -90,7 +90,7 @@ protected: dst->addCircle(loc.fX, loc.fY, fRadius); } - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { buffer.writeMatrix(this->getMatrix()); buffer.writeScalar(fRadius); } diff --git a/samplecode/GMSampleView.h b/samplecode/GMSampleView.h index 40d11abce4..c781cd0b86 100644 --- a/samplecode/GMSampleView.h +++ b/samplecode/GMSampleView.h @@ -43,7 +43,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE { + bool onEvent(const SkEvent& evt) SK_OVERRIDE { if (evt.isType("GMSampleView::showSize")) { fShowSize = SkToBool(evt.getFast32()); return true; diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp index fec7fb39fb..5346c1a18c 100644 --- a/samplecode/OverView.cpp +++ b/samplecode/OverView.cpp @@ -24,8 +24,8 @@ public: protected: // Overridden from SkEventSink: - virtual bool onEvent(const SkEvent&) SK_OVERRIDE; - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onEvent(const SkEvent&) SK_OVERRIDE; + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Overview"); return true; @@ -38,18 +38,18 @@ protected: // Overridden from SkView: - virtual void onSizeChange() SK_OVERRIDE; - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onSizeChange() SK_OVERRIDE; + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->drawColor(SK_ColorLTGRAY); } - virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE; + SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE; - virtual bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { return false; } - virtual Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { int ix = (int)(SkScalarDiv(x * N, kWidth)); int iy = (int)(SkScalarDiv(y * N, kHeight)); if (ix >= 0 && iy >= 0) { diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index f5a7c143f4..537659e0e6 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -168,11 +168,11 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect) protected: - virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE { + void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE { dst->addCircle(loc.fX, loc.fY, fRadius); } - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fRadius); } diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 29b7d11b47..6c78810b99 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -50,7 +50,7 @@ class PictFileFactory : public SkViewFactory { SkString fFilename; public: PictFileFactory(const SkString& filename) : fFilename(filename) {} - virtual SkView* operator() () const SK_OVERRIDE { + SkView* operator() () const SK_OVERRIDE { return CreateSamplePictFileView(fFilename.c_str()); } }; @@ -62,7 +62,7 @@ class PdfFileViewerFactory : public SkViewFactory { SkString fFilename; public: PdfFileViewerFactory(const SkString& filename) : fFilename(filename) {} - virtual SkView* operator() () const SK_OVERRIDE { + SkView* operator() () const SK_OVERRIDE { return CreateSamplePdfFileViewer(fFilename.c_str()); } }; @@ -344,7 +344,7 @@ public: #endif } - virtual GrRenderTarget* getGrRenderTarget() SK_OVERRIDE { + GrRenderTarget* getGrRenderTarget() SK_OVERRIDE { #if SK_SUPPORT_GPU return fCurRenderTarget; #else diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h index 3980669e31..3e8afc0174 100644 --- a/samplecode/SampleApp.h +++ b/samplecode/SampleApp.h @@ -101,7 +101,7 @@ public: SampleWindow(void* hwnd, int argc, char** argv, DeviceManager*); virtual ~SampleWindow(); - virtual SkSurface* createSurface() SK_OVERRIDE { + SkSurface* createSurface() SK_OVERRIDE { SkSurface* surface = NULL; if (fDevManager) { surface = fDevManager->createSurface(fDeviceType, this); @@ -112,7 +112,7 @@ public: return surface; } - virtual void draw(SkCanvas*) SK_OVERRIDE; + void draw(SkCanvas*) SK_OVERRIDE; void setDeviceType(DeviceType type); void toggleRendering(); @@ -138,22 +138,22 @@ public: DeviceType getDeviceType() const { return fDeviceType; } protected: - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE; - virtual bool onHandleKey(SkKey key) SK_OVERRIDE; - virtual bool onHandleChar(SkUnichar) SK_OVERRIDE; - virtual void onSizeChange() SK_OVERRIDE; + void onDraw(SkCanvas* canvas) SK_OVERRIDE; + bool onHandleKey(SkKey key) SK_OVERRIDE; + bool onHandleChar(SkUnichar) SK_OVERRIDE; + void onSizeChange() SK_OVERRIDE; - virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE; - virtual void afterChildren(SkCanvas*) SK_OVERRIDE; - virtual void beforeChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE; - virtual void afterChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE; + SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE; + void afterChildren(SkCanvas*) SK_OVERRIDE; + void beforeChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE; + void afterChild(SkView* child, SkCanvas* canvas) SK_OVERRIDE; - virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE; - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE; + bool onEvent(const SkEvent& evt) SK_OVERRIDE; + bool onQuery(SkEvent* evt) SK_OVERRIDE; virtual bool onDispatchClick(int x, int y, Click::State, void* owner, unsigned modi) SK_OVERRIDE; - virtual bool onClick(Click* click) SK_OVERRIDE; + bool onClick(Click* click) SK_OVERRIDE; virtual Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE; diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp index 6943eb7a6c..df452ce776 100644 --- a/samplecode/SampleArc.cpp +++ b/samplecode/SampleArc.cpp @@ -99,7 +99,7 @@ public: fRootDrawable = recorder.EXPERIMENTAL_endRecordingAsDrawable(); } - virtual ~ArcsView() SK_OVERRIDE { + ~ArcsView() SK_OVERRIDE { fAnimatingDrawable->unref(); fRootDrawable->unref(); } diff --git a/samplecode/SampleChart.cpp b/samplecode/SampleChart.cpp index 12a6afe0e3..ec5448cc39 100644 --- a/samplecode/SampleChart.cpp +++ b/samplecode/SampleChart.cpp @@ -88,7 +88,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Chart"); return true; @@ -96,7 +96,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { bool sizeChanged = false; if (canvas->getDeviceSize() != fSize) { fSize = canvas->getDeviceSize(); diff --git a/samplecode/SampleClock.cpp b/samplecode/SampleClock.cpp index 17ddc834af..651a995c8f 100644 --- a/samplecode/SampleClock.cpp +++ b/samplecode/SampleClock.cpp @@ -22,7 +22,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Clock"); return true; @@ -30,7 +30,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paintFill; SkPaint paintStroke; SkPath path; diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h index 93127ebb64..d09022f350 100644 --- a/samplecode/SampleCode.h +++ b/samplecode/SampleCode.h @@ -60,7 +60,7 @@ typedef SkView* (*SkViewCreateFunc)(); class SkFuncViewFactory : public SkViewFactory { public: SkFuncViewFactory(SkViewCreateFunc func); - virtual SkView* operator() () const SK_OVERRIDE; + SkView* operator() () const SK_OVERRIDE; private: SkViewCreateFunc fCreateFunc; @@ -79,7 +79,7 @@ typedef skiagm::GM* (*GMFactoryFunc)(void*); class SkGMSampleViewFactory : public SkViewFactory { public: SkGMSampleViewFactory(GMFactoryFunc func); - virtual SkView* operator() () const SK_OVERRIDE; + SkView* operator() () const SK_OVERRIDE; private: GMFactoryFunc fFunc; }; diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp index c300733131..9b9af3e3e9 100644 --- a/samplecode/SampleFatBits.cpp +++ b/samplecode/SampleFatBits.cpp @@ -404,7 +404,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "FatBits"); return true; @@ -499,7 +499,7 @@ protected: return new IndexClick(this, index); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { int index = IndexClick::GetIndex(click); if (index >= 0 && index <= 2) { fPts[index] = click->fCurr; diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp index a6b5c5ce22..073bc7caa6 100644 --- a/samplecode/SampleIdentityScale.cpp +++ b/samplecode/SampleIdentityScale.cpp @@ -43,7 +43,7 @@ protected: SkBitmap fBM; // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "IdentityScale"); return true; @@ -51,7 +51,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp index 43f5d4236a..9b61fcca5a 100644 --- a/samplecode/SampleLayers.cpp +++ b/samplecode/SampleLayers.cpp @@ -123,7 +123,7 @@ static void test_fade(SkCanvas* canvas) { class RedFilter : public SkDrawFilter { public: - virtual bool filter(SkPaint* p, SkDrawFilter::Type) SK_OVERRIDE { + bool filter(SkPaint* p, SkDrawFilter::Type) SK_OVERRIDE { fColor = p->getColor(); if (fColor == SK_ColorRED) { p->setColor(SK_ColorGREEN); diff --git a/samplecode/SampleLines.cpp b/samplecode/SampleLines.cpp index edb52fe0b5..c2509bc61e 100644 --- a/samplecode/SampleLines.cpp +++ b/samplecode/SampleLines.cpp @@ -96,7 +96,7 @@ protected: canvas->drawLine(x, y, x + SkIntToScalar(90), y + SkIntToScalar(90), paint); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { fAlpha = SkScalarRoundToInt(y); this->inval(NULL); return NULL; diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp index 81ac6aef0d..f21c7de5d8 100644 --- a/samplecode/SampleLua.cpp +++ b/samplecode/SampleLua.cpp @@ -75,7 +75,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Lua"); return true; @@ -101,7 +101,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { lua_State* L = this->ensureLua(); lua_getglobal(L, gDrawName); @@ -147,7 +147,7 @@ protected: return this->INHERITED::onFindClickHandler(x, y, modi); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { if (click->getType() != gLuaClickHandlerName) { return this->INHERITED::onClick(click); } diff --git a/samplecode/SampleManyRects.cpp b/samplecode/SampleManyRects.cpp index 5182341c71..c563394725 100644 --- a/samplecode/SampleManyRects.cpp +++ b/samplecode/SampleManyRects.cpp @@ -26,7 +26,7 @@ public: ManyRectsView() {} protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "ManyRects"); return true; diff --git a/samplecode/SampleOvalTest.cpp b/samplecode/SampleOvalTest.cpp index ef9c20d031..b3ea88c3ae 100644 --- a/samplecode/SampleOvalTest.cpp +++ b/samplecode/SampleOvalTest.cpp @@ -100,7 +100,7 @@ protected: } } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { this->inval(NULL); return NULL; } diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp index 14aae8285c..550c47c64c 100644 --- a/samplecode/SamplePath.cpp +++ b/samplecode/SamplePath.cpp @@ -201,7 +201,7 @@ protected: this->inval(NULL); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { fShowHairline = !fShowHairline; this->inval(NULL); return this->INHERITED::onFindClickHandler(x, y, modi); diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp index 04f2cdba6c..a85038edbd 100644 --- a/samplecode/SamplePathClip.cpp +++ b/samplecode/SamplePathClip.cpp @@ -70,7 +70,7 @@ protected: canvas->drawOval(oval, p); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { return new Click(this); } diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index bcbad9966c..3fb335fc34 100644 --- a/samplecode/SamplePictFile.cpp +++ b/samplecode/SamplePictFile.cpp @@ -47,7 +47,7 @@ public: } } - virtual void onTileSizeChanged(const SkSize &tileSize) SK_OVERRIDE { + void onTileSizeChanged(const SkSize &tileSize) SK_OVERRIDE { if (tileSize != fTileSize) { fTileSize = tileSize; } @@ -55,7 +55,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SkString name("P:"); const char* basename = strrchr(fFilename.c_str(), SkPATH_SEPARATOR); @@ -77,7 +77,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE { + bool onEvent(const SkEvent& evt) SK_OVERRIDE { if (evt.isType("PictFileView::toggleBBox")) { fBBox = (BBoxType)((fBBox + 1) % kBBoxTypeCount); return true; @@ -85,7 +85,7 @@ protected: return this->INHERITED::onEvent(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkASSERT(static_cast<int>(fBBox) < kBBoxTypeCount); SkPicture** picture = fPictures + fBBox; diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp index 691f57ada4..9d2f6ffc01 100644 --- a/samplecode/SampleRectanizer.cpp +++ b/samplecode/SampleRectanizer.cpp @@ -51,7 +51,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Rectanizer"); return true; @@ -77,7 +77,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { if (fCurRandRect < kNumRandRects) { if (fCurRectanizer->addRect((*fCurRects)[fCurRandRect].fWidth, (*fCurRects)[fCurRandRect].fHeight, diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp index 70105d2a6d..c25b0733df 100644 --- a/samplecode/SampleRegion.cpp +++ b/samplecode/SampleRegion.cpp @@ -219,7 +219,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Regions"); return true; @@ -321,7 +321,7 @@ protected: canvas->drawPath(path, paint); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { if (false) { // avoid bit rot, suppress warning test_strokerect(canvas); return; @@ -399,7 +399,7 @@ protected: SkScalarRoundToInt(y)) ? new Click(this) : NULL; } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { fRect.offset(click->fICurr.fX - click->fIPrev.fX, click->fICurr.fY - click->fIPrev.fY); this->inval(NULL); diff --git a/samplecode/SampleRepeatTile.cpp b/samplecode/SampleRepeatTile.cpp index fbbc4722a0..bfdfab8c19 100644 --- a/samplecode/SampleRepeatTile.cpp +++ b/samplecode/SampleRepeatTile.cpp @@ -49,7 +49,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "RepeatTile"); return true; @@ -57,7 +57,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; make_paint(&paint, SkShader::kRepeat_TileMode); @@ -66,13 +66,13 @@ protected: canvas->drawPaint(paint); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { this->inval(NULL); return this->INHERITED::onFindClickHandler(x, y, modi); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { return this->INHERITED::onClick(click); } diff --git a/samplecode/SampleRotateCircles.cpp b/samplecode/SampleRotateCircles.cpp index 0687b0696e..139c23c9b5 100644 --- a/samplecode/SampleRotateCircles.cpp +++ b/samplecode/SampleRotateCircles.cpp @@ -96,7 +96,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "RotateCircles2"); return true; @@ -128,7 +128,7 @@ protected: canvas->drawBitmap(bm, 0, 0, NULL); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkScalar radius = 256; canvas->translate(10, 10); @@ -236,7 +236,7 @@ public: } protected: - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "RotateCircles3"); return true; @@ -244,7 +244,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onSizeChange() SK_OVERRIDE { + void onSizeChange() SK_OVERRIDE { fErrorControl.setXYWH(this->width() - 100, 30, 30, 400); fWidthControl.setXYWH(this->width() - 50, 30, 30, 400); fCubicButton.fBounds.setXYWH(this->width() - 50, 450, 30, 30); @@ -350,7 +350,7 @@ protected: canvas->drawText(name, strlen(name), bounds.fLeft, bounds.bottom() + 11, paint); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPath path; SkScalar width = fWidth; @@ -450,7 +450,7 @@ protected: return (SkIntToScalar(y) - control.fTop) / control.height() * (max - min) + min; } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { int index = ((MyClick*)click)->fIndex; if (index < (int) SK_ARRAY_COUNT(fPts)) { fPts[index].offset(SkIntToScalar(click->fICurr.fX - click->fIPrev.fX), diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp index 0e70a3e2d7..5a358c6af9 100644 --- a/samplecode/SampleShaders.cpp +++ b/samplecode/SampleShaders.cpp @@ -83,7 +83,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Shaders"); return true; @@ -91,7 +91,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { canvas->drawBitmap(fBitmap, 0, 0); canvas->translate(SkIntToScalar(20), SkIntToScalar(120)); @@ -127,7 +127,7 @@ protected: return this->INHERITED::onFindClickHandler(x, y, modi); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { return this->INHERITED::onClick(click); } diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index 603714a120..e115235ffa 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -697,7 +697,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Slides"); return true; @@ -705,12 +705,12 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { this->init(); gProc[fIndex](canvas); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { this->init(); fIndex = (fIndex + 1) % SK_ARRAY_COUNT(gProc); this->inval(NULL); diff --git a/samplecode/SampleStringArt.cpp b/samplecode/SampleStringArt.cpp index 353d4cc957..8522478783 100644 --- a/samplecode/SampleStringArt.cpp +++ b/samplecode/SampleStringArt.cpp @@ -19,7 +19,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "StringArt"); return true; @@ -27,7 +27,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkScalar angle = fAngle*SK_ScalarPI + SkScalarHalf(SK_ScalarPI); SkPoint center = SkPoint::Make(SkScalarHalf(this->width()), SkScalarHalf(this->height())); @@ -55,7 +55,7 @@ protected: canvas->drawPath(path, paint); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { fAngle = x/width(); this->inval(NULL); return NULL; diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp index ab75fb3fe6..4f6e3cc743 100644 --- a/samplecode/SampleStrokePath.cpp +++ b/samplecode/SampleStrokePath.cpp @@ -124,7 +124,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "StrokePath"); return true; @@ -146,7 +146,7 @@ protected: } } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { test_huge_stroke(canvas); return; canvas->translate(SkIntToScalar(10), SkIntToScalar(10)); diff --git a/samplecode/SampleSubpixelTranslate.cpp b/samplecode/SampleSubpixelTranslate.cpp index 4652bc37ad..4695962c48 100644 --- a/samplecode/SampleSubpixelTranslate.cpp +++ b/samplecode/SampleSubpixelTranslate.cpp @@ -52,7 +52,7 @@ protected: SkPoint fCurPos; // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "SubpixelTranslate"); return true; @@ -60,7 +60,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { static const SkPaint::FilterLevel gLevels[] = { SkPaint::kNone_FilterLevel, diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index 82fee4a79a..112573e967 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -115,7 +115,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Text"); return true; @@ -143,7 +143,7 @@ protected: pts[i].set(rand->nextUScalar1() * 640, rand->nextUScalar1() * 480); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkAutoCanvasRestore restore(canvas, false); { SkRect r; @@ -192,7 +192,7 @@ protected: return this->INHERITED::onFindClickHandler(x, y, modi); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { return this->INHERITED::onClick(click); } diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp index f5c8e9da14..58e1db2686 100644 --- a/samplecode/SampleTextAlpha.cpp +++ b/samplecode/SampleTextAlpha.cpp @@ -36,7 +36,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "TextAlpha"); return true; @@ -44,7 +44,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { const char* str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; SkPaint paint; SkScalar x = SkIntToScalar(10); @@ -69,11 +69,11 @@ protected: } } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { return new Click(this); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { int y = click->fICurr.fY; if (y < 0) { y = 0; diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp index 2ba387a32a..ac889c3dae 100644 --- a/samplecode/SampleTextOnPath.cpp +++ b/samplecode/SampleTextOnPath.cpp @@ -105,7 +105,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Text On Path"); return true; @@ -113,7 +113,7 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(48)); @@ -151,13 +151,13 @@ protected: this->inval(NULL); } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { fHints += 1; this->inval(NULL); return this->INHERITED::onFindClickHandler(x, y, modi); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { return this->INHERITED::onClick(click); } diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp index ffe4428b48..9591fec159 100644 --- a/samplecode/SampleUnpremul.cpp +++ b/samplecode/SampleUnpremul.cpp @@ -51,7 +51,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "unpremul"); return true; @@ -77,14 +77,14 @@ protected: return this->INHERITED::onQuery(evt); } - virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { + void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; SkAutoTUnref<SkShader> shader(createChecker()); paint.setShader(shader.get()); canvas->drawPaint(paint); } - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(24)); diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp index 748c5a65eb..6dac0b586a 100644 --- a/samplecode/SampleVertices.cpp +++ b/samplecode/SampleVertices.cpp @@ -77,7 +77,7 @@ public: protected: // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) SK_OVERRIDE { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Vertices"); return true; @@ -87,7 +87,7 @@ protected: SkScalar fScale; - virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; paint.setDither(true); paint.setFilterLevel(SkPaint::kLow_FilterLevel); @@ -119,11 +119,11 @@ protected: } } - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { + SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { return new Click(this); } - virtual bool onClick(Click* click) SK_OVERRIDE { + bool onClick(Click* click) SK_OVERRIDE { // fCurrX = click->fICurr.fX; // fCurrY = click->fICurr.fY; this->inval(NULL); diff --git a/site/user/sample/hello.md b/site/user/sample/hello.md index 324ff6b240..78cf6f9add 100644 --- a/site/user/sample/hello.md +++ b/site/user/sample/hello.md @@ -72,7 +72,7 @@ class HelloTutorial : public SkExample { } protected: - virtual void draw(SkCanvas* canvas) SK_OVERRIDE { + void draw(SkCanvas* canvas) SK_OVERRIDE { // Clear background canvas->drawColor(SK_ColorWHITE); diff --git a/src/animator/SkAnimate.h b/src/animator/SkAnimate.h index f6541243e4..225d27d35e 100644 --- a/src/animator/SkAnimate.h +++ b/src/animator/SkAnimate.h @@ -19,11 +19,11 @@ class SkAnimate : public SkAnimateBase { DECLARE_MEMBER_INFO(Animate); SkAnimate(); virtual ~SkAnimate(); - virtual int components() SK_OVERRIDE; + int components() SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; protected: bool resolveCommon(SkAnimateMaker& ); int fComponents; diff --git a/src/animator/SkAnimateBase.h b/src/animator/SkAnimateBase.h index 63ee537bd3..69272977b9 100644 --- a/src/animator/SkAnimateBase.h +++ b/src/animator/SkAnimateBase.h @@ -24,26 +24,26 @@ public: SkAnimateBase(); virtual ~SkAnimateBase(); virtual int components(); - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - virtual void dirty() SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + void dirty() SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif int entries() { return fValues.count() / components(); } virtual bool hasExecute() const; bool isDynamic() const { return SkToBool(fDynamic); } - virtual SkDisplayable* getParent() const SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + SkDisplayable* getParent() const SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; SkMSec getStart() const { return fStart; } SkOperand* getValues() { return fValues.begin(); } SkDisplayTypes getValuesType() { return fValues.getType(); } - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; void packARGB(SkScalar [], int count, SkTDOperandArray* ); virtual void refresh(SkAnimateMaker& ); void setChanged(bool changed) { fChanged = changed; } void setHasEndEvent() { fHasEndEvent = true; } - virtual bool setParent(SkDisplayable* ) SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE; + bool setParent(SkDisplayable* ) SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE; void setTarget(SkAnimateMaker& ); virtual bool targetNeedsInitialization() const; protected: diff --git a/src/animator/SkAnimateSet.h b/src/animator/SkAnimateSet.h index 6f38e9eaa9..c1ccde3b51 100644 --- a/src/animator/SkAnimateSet.h +++ b/src/animator/SkAnimateSet.h @@ -16,10 +16,10 @@ class SkSet : public SkAnimate { DECLARE_MEMBER_INFO(Set); SkSet(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual void refresh(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void refresh(SkAnimateMaker& ) SK_OVERRIDE; private: typedef SkAnimate INHERITED; }; diff --git a/src/animator/SkDisplayAdd.h b/src/animator/SkDisplayAdd.h index 6ba4933acd..9e0ff303dc 100644 --- a/src/animator/SkDisplayAdd.h +++ b/src/animator/SkDisplayAdd.h @@ -22,15 +22,15 @@ class SkAdd : public SkADrawable { kMode_immediate }; - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool hasEnable() const SK_OVERRIDE; - virtual void initialize() SK_OVERRIDE; - virtual bool isDrawable() const SK_OVERRIDE; + bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; + void initialize() SK_OVERRIDE; + bool isDrawable() const SK_OVERRIDE; protected: // struct _A { Mode mode; diff --git a/src/animator/SkDisplayApply.h b/src/animator/SkDisplayApply.h index 2d09fbec1e..9e7e12f078 100644 --- a/src/animator/SkDisplayApply.h +++ b/src/animator/SkDisplayApply.h @@ -38,41 +38,41 @@ public: void appendActive(SkActive* ); void applyValues(int animatorIndex, SkOperand* values, int count, SkDisplayTypes , SkMSec time); - virtual bool contains(SkDisplayable*) SK_OVERRIDE; + bool contains(SkDisplayable*) SK_OVERRIDE; // void createActive(SkAnimateMaker& ); - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; void disable(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool enable(SkAnimateMaker& ) SK_OVERRIDE; void enableCreate(SkAnimateMaker& ); void enableDynamic(SkAnimateMaker& ); void endSave(int index); Mode getMode() { return mode; } - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; SkADrawable* getScope() { return scope; } void getStep(SkScriptValue* ); SkADrawable* getTarget(SkAnimateBase* ); bool hasDelayedAnimator() const; - virtual bool hasEnable() const SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; bool inactivate(SkAnimateMaker& maker); - virtual void initialize() SK_OVERRIDE; + void initialize() SK_OVERRIDE; bool interpolate(SkAnimateMaker& , SkMSec time); - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; void refresh(SkAnimateMaker& ); void reset(); - virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE; + bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE; bool resolveField(SkAnimateMaker& , SkDisplayable* parent, SkString* str); void save(int index); void setEmbedded() { fEmbedded = true; } - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; - virtual void setSteps(int _steps) SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + void setSteps(int _steps) SK_OVERRIDE; // virtual void setTime(SkMSec time); #ifdef SK_DEBUG - virtual void validate() SK_OVERRIDE; + void validate() SK_OVERRIDE; #endif private: SkMSec begin; diff --git a/src/animator/SkDisplayBounds.h b/src/animator/SkDisplayBounds.h index 7ca1cc57c1..4c21871433 100644 --- a/src/animator/SkDisplayBounds.h +++ b/src/animator/SkDisplayBounds.h @@ -15,7 +15,7 @@ class SkDisplayBounds : public SkDrawRect { DECLARE_DISPLAY_MEMBER_INFO(Bounds); SkDisplayBounds(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: SkBool inval; typedef SkDrawRect INHERITED; diff --git a/src/animator/SkDisplayEvent.h b/src/animator/SkDisplayEvent.h index 92eb8cf2e9..4da49b989f 100644 --- a/src/animator/SkDisplayEvent.h +++ b/src/animator/SkDisplayEvent.h @@ -34,17 +34,17 @@ class SkDisplayEvent : public SkDisplayable { }; SkDisplayEvent(); virtual ~SkDisplayEvent(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; - virtual bool contains(SkDisplayable*) SK_OVERRIDE; - virtual SkDisplayable* contains(const SkString& ) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool contains(SkDisplayable*) SK_OVERRIDE; + SkDisplayable* contains(const SkString& ) SK_OVERRIDE; #ifdef SK_DEBUG void dumpEvent(SkAnimateMaker* ); #endif bool enableEvent(SkAnimateMaker& ); - virtual bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; + void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; void populateInput(SkAnimateMaker& , const SkEvent& fEvent); - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; protected: SkKey code; SkBool disable; diff --git a/src/animator/SkDisplayInclude.h b/src/animator/SkDisplayInclude.h index 9e0cfe2cb5..1b6580a6f4 100644 --- a/src/animator/SkDisplayInclude.h +++ b/src/animator/SkDisplayInclude.h @@ -15,9 +15,9 @@ class SkInclude : public SkDisplayable { DECLARE_MEMBER_INFO(Include); - virtual void onEndElement(SkAnimateMaker & ) SK_OVERRIDE; - virtual bool enable(SkAnimateMaker & ) SK_OVERRIDE; - virtual bool hasEnable() const SK_OVERRIDE; + void onEndElement(SkAnimateMaker & ) SK_OVERRIDE; + bool enable(SkAnimateMaker & ) SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; protected: SkString src; }; diff --git a/src/animator/SkDisplayInput.h b/src/animator/SkDisplayInput.h index 045a2e4eed..8eba70947b 100644 --- a/src/animator/SkDisplayInput.h +++ b/src/animator/SkDisplayInput.h @@ -16,10 +16,10 @@ class SkInput : public SkDisplayable { DECLARE_MEMBER_INFO(Input); SkInput(); - virtual SkDisplayable* contains(const SkString& ) SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual bool enable(SkAnimateMaker & ) SK_OVERRIDE; - virtual bool hasEnable() const SK_OVERRIDE; + SkDisplayable* contains(const SkString& ) SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool enable(SkAnimateMaker & ) SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; protected: SkString name; int32_t fInt; diff --git a/src/animator/SkDisplayMath.h b/src/animator/SkDisplayMath.h index 301e0f2e4b..05c1fe46b7 100644 --- a/src/animator/SkDisplayMath.h +++ b/src/animator/SkDisplayMath.h @@ -19,8 +19,8 @@ class SkDisplayMath : public SkDisplayable { virtual void executeFunction(SkDisplayable* , int index, SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, SkScriptValue* ) SK_OVERRIDE; - virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; private: mutable SkRandom fRandom; static const SkScalar gConstants[]; diff --git a/src/animator/SkDisplayMovie.h b/src/animator/SkDisplayMovie.h index cc944f56b6..c1f184d8fe 100644 --- a/src/animator/SkDisplayMovie.h +++ b/src/animator/SkDisplayMovie.h @@ -21,21 +21,21 @@ class SkDisplayMovie : public SkADrawable { SkDisplayMovie(); virtual ~SkDisplayMovie(); void buildMovie(); - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - virtual void dirty() SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + void dirty() SK_OVERRIDE; bool doEvent(const SkEvent& evt) { return fLoaded && fMovie.doEvent(evt); } - virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; - virtual void dumpEvents() SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dumpEvents() SK_OVERRIDE; #endif - virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool enable(SkAnimateMaker& ) SK_OVERRIDE; const SkAnimator* getAnimator() const { return &fMovie; } - virtual bool hasEnable() const SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; protected: SkString src; SkAnimator fMovie; diff --git a/src/animator/SkDisplayNumber.h b/src/animator/SkDisplayNumber.h index 2fc75b780c..92f0fa3a03 100644 --- a/src/animator/SkDisplayNumber.h +++ b/src/animator/SkDisplayNumber.h @@ -15,7 +15,7 @@ class SkDisplayNumber : public SkDisplayable { DECLARE_DISPLAY_MEMBER_INFO(Number); - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; private: }; diff --git a/src/animator/SkDisplayPost.h b/src/animator/SkDisplayPost.h index 6808292aa6..c6c4b51660 100644 --- a/src/animator/SkDisplayPost.h +++ b/src/animator/SkDisplayPost.h @@ -27,17 +27,17 @@ class SkPost : public SkDisplayable { }; SkPost(); virtual ~SkPost(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; - virtual bool childrenNeedDisposing() const SK_OVERRIDE; - virtual void dirty() SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool childrenNeedDisposing() const SK_OVERRIDE; + void dirty() SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool hasEnable() const SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual void setChildHasID() SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void setChildHasID() SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; protected: SkMSec delay; SkString sink; diff --git a/src/animator/SkDisplayRandom.h b/src/animator/SkDisplayRandom.h index e649fce9d7..6a04f59b6e 100644 --- a/src/animator/SkDisplayRandom.h +++ b/src/animator/SkDisplayRandom.h @@ -26,10 +26,10 @@ class SkDisplayRandom : public SkDisplayable { DECLARE_DISPLAY_MEMBER_INFO(Random); SkDisplayRandom(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; private: SkScalar blend; SkScalar min; diff --git a/src/animator/SkDisplayTypes.h b/src/animator/SkDisplayTypes.h index 01a68d0184..a9432dadf1 100644 --- a/src/animator/SkDisplayTypes.h +++ b/src/animator/SkDisplayTypes.h @@ -34,7 +34,7 @@ class SkDisplayBoolean : public SkDisplayDepend { DECLARE_DISPLAY_MEMBER_INFO(Boolean); SkDisplayBoolean(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif SkBool value; friend class SkAnimatorScript; @@ -47,7 +47,7 @@ class SkDisplayInt : public SkDisplayDepend { DECLARE_DISPLAY_MEMBER_INFO(Int); SkDisplayInt(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif private: int32_t value; @@ -61,7 +61,7 @@ class SkDisplayFloat : public SkDisplayDepend { DECLARE_DISPLAY_MEMBER_INFO(Float); SkDisplayFloat(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif private: SkScalar value; @@ -78,8 +78,8 @@ class SkDisplayString : public SkDisplayDepend { virtual void executeFunction(SkDisplayable* , int index, SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, SkScriptValue* ) SK_OVERRIDE; - virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; + const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; SkString value; private: static const SkFunctionParamType fFunctionParameters[]; @@ -91,7 +91,7 @@ class SkDisplayArray : public SkDisplayDepend { SkDisplayArray(SkTypedArray& ); SkDisplayArray(SkOpArray& ); // compiled script experiment virtual ~SkDisplayArray(); - virtual bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; private: SkTypedArray values; friend class SkAnimator; diff --git a/src/animator/SkDraw3D.h b/src/animator/SkDraw3D.h index b652d69f72..5f066ba65f 100644 --- a/src/animator/SkDraw3D.h +++ b/src/animator/SkDraw3D.h @@ -27,7 +27,7 @@ class Sk3D_Camera : public SkADrawable { DECLARE_MEMBER_INFO(3D_Camera); Sk3D_Camera(); virtual ~Sk3D_Camera(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: SkScalar hackWidth; SkScalar hackHeight; @@ -41,7 +41,7 @@ private: virtual void executeFunction(SkDisplayable* , int index, SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, SkScriptValue* ) SK_OVERRIDE; - virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; + const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; SkPatch3D fPatch; static const SkFunctionParamType fFunctionParameters[]; friend class Sk3D_Camera; diff --git a/src/animator/SkDrawBitmap.h b/src/animator/SkDrawBitmap.h index 0ebea9c6de..a1b74b6502 100644 --- a/src/animator/SkDrawBitmap.h +++ b/src/animator/SkDrawBitmap.h @@ -20,7 +20,7 @@ class SkBaseBitmap : public SkBoundable { DECLARE_MEMBER_INFO(BaseBitmap); SkBaseBitmap(); virtual ~SkBaseBitmap(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; protected: SkBitmap fBitmap; SkScalar x; @@ -36,10 +36,10 @@ class SkDrawBitmap : public SkBaseBitmap { SkDrawBitmap(); virtual ~SkDrawBitmap(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE; protected: int /*SkBitmap::Config*/ format; int32_t height; @@ -54,11 +54,11 @@ class SkImageBaseBitmap : public SkBaseBitmap { DECLARE_MEMBER_INFO(ImageBaseBitmap); SkImageBaseBitmap(); virtual ~SkImageBaseBitmap(); - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - virtual void dirty() SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + void dirty() SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; private: void resolve() const { (const_cast<SkImageBaseBitmap*>(this))->resolve(); } void resolve(); diff --git a/src/animator/SkDrawBlur.h b/src/animator/SkDrawBlur.h index 75075922dc..56f29db295 100644 --- a/src/animator/SkDrawBlur.h +++ b/src/animator/SkDrawBlur.h @@ -14,7 +14,7 @@ class SkDrawBlur : public SkDrawMaskFilter { DECLARE_DRAW_MEMBER_INFO(Blur); SkDrawBlur(); - virtual SkMaskFilter* getMaskFilter() SK_OVERRIDE; + SkMaskFilter* getMaskFilter() SK_OVERRIDE; protected: SkScalar fSigma; int /*SkBlurStyle*/ fBlurStyle; diff --git a/src/animator/SkDrawClip.h b/src/animator/SkDrawClip.h index 7b21863d93..54c8651fa8 100644 --- a/src/animator/SkDrawClip.h +++ b/src/animator/SkDrawClip.h @@ -20,7 +20,7 @@ class SkDrawRect; class SkDrawClip : public SkADrawable { DECLARE_DRAW_MEMBER_INFO(Clip); SkDrawClip(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: SkDrawRect* rect; SkDrawPath* path; diff --git a/src/animator/SkDrawColor.h b/src/animator/SkDrawColor.h index 5ce495eec0..b5b4f2d5d6 100644 --- a/src/animator/SkDrawColor.h +++ b/src/animator/SkDrawColor.h @@ -14,18 +14,18 @@ class SkDrawColor : public SkPaintPart { DECLARE_DRAW_MEMBER_INFO(Color); SkDrawColor(); - virtual bool add() SK_OVERRIDE; - virtual void dirty() SK_OVERRIDE; + bool add() SK_OVERRIDE; + void dirty() SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif SkColor getColor(); - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - virtual SkDisplayable* getParent() const SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool setParent(SkDisplayable* parent) SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue&) SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + SkDisplayable* getParent() const SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + bool setParent(SkDisplayable* parent) SK_OVERRIDE; + bool setProperty(int index, SkScriptValue&) SK_OVERRIDE; protected: SkColor color; SkScalar fHue; diff --git a/src/animator/SkDrawDash.h b/src/animator/SkDrawDash.h index b4f086a307..fa020c2a6b 100644 --- a/src/animator/SkDrawDash.h +++ b/src/animator/SkDrawDash.h @@ -15,7 +15,7 @@ class SkDash : public SkDrawPathEffect { DECLARE_MEMBER_INFO(Dash); SkDash(); virtual ~SkDash(); - virtual SkPathEffect* getPathEffect() SK_OVERRIDE; + SkPathEffect* getPathEffect() SK_OVERRIDE; private: SkTDScalarArray intervals; SkScalar phase; diff --git a/src/animator/SkDrawDiscrete.h b/src/animator/SkDrawDiscrete.h index 7e1150633a..ea44199f1e 100644 --- a/src/animator/SkDrawDiscrete.h +++ b/src/animator/SkDrawDiscrete.h @@ -13,7 +13,7 @@ class SkDiscrete : public SkDrawPathEffect { DECLARE_MEMBER_INFO(Discrete); SkDiscrete(); - virtual SkPathEffect* getPathEffect() SK_OVERRIDE; + SkPathEffect* getPathEffect() SK_OVERRIDE; private: SkScalar deviation; SkScalar segLength; diff --git a/src/animator/SkDrawEmboss.h b/src/animator/SkDrawEmboss.h index 7ffd3ef841..6ffe207f7c 100644 --- a/src/animator/SkDrawEmboss.h +++ b/src/animator/SkDrawEmboss.h @@ -15,7 +15,7 @@ class SkDrawEmboss : public SkDrawMaskFilter { DECLARE_DRAW_MEMBER_INFO(Emboss); SkDrawEmboss(); - virtual SkMaskFilter* getMaskFilter() SK_OVERRIDE; + SkMaskFilter* getMaskFilter() SK_OVERRIDE; protected: SkTDScalarArray fDirection; SkScalar fSigma; diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp index dc586055a7..0e4582b6ea 100644 --- a/src/animator/SkDrawExtraPathEffect.cpp +++ b/src/animator/SkDrawExtraPathEffect.cpp @@ -20,8 +20,8 @@ class SkDrawShapePathEffect : public SkDrawPathEffect { DECLARE_PRIVATE_MEMBER_INFO(DrawShapePathEffect); SkDrawShapePathEffect(); virtual ~SkDrawShapePathEffect(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE; - virtual SkPathEffect* getPathEffect() SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE; + SkPathEffect* getPathEffect() SK_OVERRIDE; protected: SkADrawable* addPath; SkADrawable* addMatrix; @@ -35,7 +35,7 @@ class SkDrawShape1DPathEffect : public SkDrawShapePathEffect { DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape1DPathEffect); SkDrawShape1DPathEffect(SkDisplayTypes ); virtual ~SkDrawShape1DPathEffect(); - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; private: SkString phase; SkString spacing; @@ -47,7 +47,7 @@ class SkDrawShape2DPathEffect : public SkDrawShapePathEffect { DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape2DPathEffect); SkDrawShape2DPathEffect(SkDisplayTypes ); virtual ~SkDrawShape2DPathEffect(); - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; private: SkDrawMatrix* matrix; friend class SkShape2DPathEffect; @@ -58,9 +58,9 @@ class SkDrawComposePathEffect : public SkDrawPathEffect { DECLARE_EXTRAS_MEMBER_INFO(SkDrawComposePathEffect); SkDrawComposePathEffect(SkDisplayTypes ); virtual ~SkDrawComposePathEffect(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE; - virtual SkPathEffect* getPathEffect() SK_OVERRIDE; - virtual bool isPaint() const SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE; + SkPathEffect* getPathEffect() SK_OVERRIDE; + bool isPaint() const SK_OVERRIDE; private: SkDrawPathEffect* effect1; SkDrawPathEffect* effect2; @@ -70,7 +70,7 @@ class SkDrawCornerPathEffect : public SkDrawPathEffect { DECLARE_EXTRAS_MEMBER_INFO(SkDrawCornerPathEffect); SkDrawCornerPathEffect(SkDisplayTypes ); virtual ~SkDrawCornerPathEffect(); - virtual SkPathEffect* getPathEffect() SK_OVERRIDE; + SkPathEffect* getPathEffect() SK_OVERRIDE; private: SkScalar radius; }; @@ -93,7 +93,7 @@ public: Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; } protected: - virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE { + SkScalar begin(SkScalar contourLength) const SK_OVERRIDE { SkScriptValue value; SkAnimatorScript engine(*fMaker, NULL, SkType_Float); engine.propertyCallBack(GetContourLength, &contourLength); @@ -102,7 +102,7 @@ protected: return value.fOperand.fScalar; } - virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const SK_OVERRIDE { + SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const SK_OVERRIDE { fMaker->setExtraPropertyCallBack(fDraw->fType, GetDistance, &distance); SkDrawPath* drawPath = NULL; if (fDraw->addPath->isPath()) { @@ -233,11 +233,11 @@ public: Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; } protected: - virtual void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE { + void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE { const_cast<SkShape2DPathEffect*>(this)->setUVBounds(uvBounds); } - virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE { + void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE { const_cast<SkShape2DPathEffect*>(this)->addPath(loc, u, v, dst); } diff --git a/src/animator/SkDrawFull.h b/src/animator/SkDrawFull.h index 13c204e483..029fb33394 100644 --- a/src/animator/SkDrawFull.h +++ b/src/animator/SkDrawFull.h @@ -14,7 +14,7 @@ class SkFull : public SkBoundable { DECLARE_EMPTY_MEMBER_INFO(Full); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: typedef SkBoundable INHERITED; }; diff --git a/src/animator/SkDrawGradient.h b/src/animator/SkDrawGradient.h index 545179b5a9..d6dd14491c 100644 --- a/src/animator/SkDrawGradient.h +++ b/src/animator/SkDrawGradient.h @@ -18,11 +18,11 @@ class SkDrawGradient : public SkDrawShader { DECLARE_PRIVATE_MEMBER_INFO(DrawGradient); SkDrawGradient(); virtual ~SkDrawGradient(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED virtual void dumpRest(SkAnimateMaker*); #endif - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; protected: SkTDScalarArray offsets; SkString unitMapper; @@ -36,11 +36,11 @@ private: class SkDrawLinearGradient : public SkDrawGradient { DECLARE_MEMBER_INFO(DrawLinearGradient); SkDrawLinearGradient(); - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker*) SK_OVERRIDE; + void dump(SkAnimateMaker*) SK_OVERRIDE; #endif - virtual SkShader* getShader() SK_OVERRIDE; + SkShader* getShader() SK_OVERRIDE; protected: SkTDScalarArray points; private: @@ -51,9 +51,9 @@ class SkDrawRadialGradient : public SkDrawGradient { DECLARE_MEMBER_INFO(DrawRadialGradient); SkDrawRadialGradient(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker*) SK_OVERRIDE; + void dump(SkAnimateMaker*) SK_OVERRIDE; #endif - virtual SkShader* getShader() SK_OVERRIDE; + SkShader* getShader() SK_OVERRIDE; protected: SkPoint center; SkScalar radius; diff --git a/src/animator/SkDrawGroup.h b/src/animator/SkDrawGroup.h index a6bebf0e64..5d33dfe596 100644 --- a/src/animator/SkDrawGroup.h +++ b/src/animator/SkDrawGroup.h @@ -19,25 +19,25 @@ public: DECLARE_MEMBER_INFO(Group); SkGroup(); virtual ~SkGroup(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; - virtual bool contains(SkDisplayable* ) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool contains(SkDisplayable* ) SK_OVERRIDE; SkGroup* copy(); SkBool copySet(int index); - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; virtual void dumpDrawables(SkAnimateMaker* ); - virtual void dumpEvents() SK_OVERRIDE; + void dumpEvents() SK_OVERRIDE; #endif int findGroup(SkADrawable* drawable, SkTDDrawableArray** list, SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList); - virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool enable(SkAnimateMaker& ) SK_OVERRIDE; SkTDDrawableArray* getChildren() { return &fChildren; } SkGroup* getOriginal() { return fOriginal; } - virtual bool hasEnable() const SK_OVERRIDE; - virtual void initialize() SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; + void initialize() SK_OVERRIDE; SkBool isACopy() { return fOriginal != NULL; } void markCopyClear(int index); void markCopySet(int index); @@ -45,9 +45,9 @@ public: bool markedForDelete(int index) const { return (fCopies[index >> 5] & 1 << (index & 0x1f)) == 0; } void reset(); bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE; - virtual void setSteps(int steps) SK_OVERRIDE; + void setSteps(int steps) SK_OVERRIDE; #ifdef SK_DEBUG - virtual void validate() SK_OVERRIDE; + void validate() SK_OVERRIDE; #endif protected: bool ifCondition(SkAnimateMaker& maker, SkADrawable* drawable, @@ -64,7 +64,7 @@ private: class SkSave: public SkGroup { DECLARE_MEMBER_INFO(Save); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: typedef SkGroup INHERITED; }; diff --git a/src/animator/SkDrawLine.h b/src/animator/SkDrawLine.h index 5665433b07..7367aab643 100644 --- a/src/animator/SkDrawLine.h +++ b/src/animator/SkDrawLine.h @@ -16,7 +16,7 @@ class SkLine : public SkBoundable { DECLARE_MEMBER_INFO(Line); SkLine(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: SkScalar x1; SkScalar x2; diff --git a/src/animator/SkDrawMatrix.h b/src/animator/SkDrawMatrix.h index 60eb8e7db7..d5e19a59e9 100644 --- a/src/animator/SkDrawMatrix.h +++ b/src/animator/SkDrawMatrix.h @@ -21,25 +21,25 @@ class SkDrawMatrix : public SkADrawable { DECLARE_DRAW_MEMBER_INFO(Matrix); SkDrawMatrix(); virtual ~SkDrawMatrix(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; - virtual bool childrenNeedDisposing() const SK_OVERRIDE; - virtual void dirty() SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool childrenNeedDisposing() const SK_OVERRIDE; + void dirty() SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif SkMatrix& getMatrix(); - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual void initialize() SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual void setChildHasID() SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + void initialize() SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void setChildHasID() SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; void concat(SkMatrix& inMatrix) { fConcat.preConcat(inMatrix); } - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; void rotate(SkScalar degrees, SkPoint& center) { diff --git a/src/animator/SkDrawOval.h b/src/animator/SkDrawOval.h index 803568817f..03b0270367 100644 --- a/src/animator/SkDrawOval.h +++ b/src/animator/SkDrawOval.h @@ -14,7 +14,7 @@ class SkOval : public SkDrawRect { DECLARE_MEMBER_INFO(Oval); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: typedef SkDrawRect INHERITED; }; diff --git a/src/animator/SkDrawPaint.h b/src/animator/SkDrawPaint.h index 5ac5a93ea2..e2be340ef2 100644 --- a/src/animator/SkDrawPaint.h +++ b/src/animator/SkDrawPaint.h @@ -27,17 +27,17 @@ class SkDrawPaint : public SkADrawable { SkDrawPaint(); virtual ~SkDrawPaint(); virtual bool add(SkAnimateMaker* , SkDisplayable* child); - virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif virtual void executeFunction(SkDisplayable* target, int index, SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, SkScriptValue* ) SK_OVERRIDE; - virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) SK_OVERRIDE; + const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) SK_OVERRIDE; protected: static const SkFunctionParamType fFunctionParameters[]; void setupPaint(SkPaint* paint) const; diff --git a/src/animator/SkDrawPath.h b/src/animator/SkDrawPath.h index cce8cd56b7..d64195b0cb 100644 --- a/src/animator/SkDrawPath.h +++ b/src/animator/SkDrawPath.h @@ -19,22 +19,22 @@ class SkDrawPath : public SkBoundable { DECLARE_DRAW_MEMBER_INFO(Path); SkDrawPath(); virtual ~SkDrawPath(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; bool childHasID() { return SkToBool(fChildHasID); } - virtual bool childrenNeedDisposing() const SK_OVERRIDE; - virtual void dirty() SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; - virtual SkDisplayable* getParent() const SK_OVERRIDE; + bool childrenNeedDisposing() const SK_OVERRIDE; + void dirty() SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; + SkDisplayable* getParent() const SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif SkPath& getPath(); - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual void setChildHasID() SK_OVERRIDE; - virtual bool setParent(SkDisplayable* parent) SK_OVERRIDE; - virtual bool isPath() const SK_OVERRIDE { return true; } + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void setChildHasID() SK_OVERRIDE; + bool setParent(SkDisplayable* parent) SK_OVERRIDE; + bool isPath() const SK_OVERRIDE { return true; } public: SkPath fPath; protected: @@ -51,8 +51,8 @@ private: class SkPolyline : public SkDrawPath { DECLARE_MEMBER_INFO(Polyline); - virtual bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; protected: SkTDScalarArray points; private: @@ -61,7 +61,7 @@ private: class SkPolygon : public SkPolyline { DECLARE_MEMBER_INFO(Polygon); - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; private: typedef SkPolyline INHERITED; }; diff --git a/src/animator/SkDrawPoint.h b/src/animator/SkDrawPoint.h index 69005a1c68..f2077f8fcf 100644 --- a/src/animator/SkDrawPoint.h +++ b/src/animator/SkDrawPoint.h @@ -24,7 +24,7 @@ private: class SkDrawPoint : public SkDisplayable { DECLARE_MEMBER_INFO(DrawPoint); SkDrawPoint(); - virtual void getBounds(SkRect* ) SK_OVERRIDE; + void getBounds(SkRect* ) SK_OVERRIDE; private: SkPoint fPoint; typedef SkDisplayable INHERITED; diff --git a/src/animator/SkDrawRectangle.h b/src/animator/SkDrawRectangle.h index a9fb884b0a..44ed7c477d 100644 --- a/src/animator/SkDrawRectangle.h +++ b/src/animator/SkDrawRectangle.h @@ -19,15 +19,15 @@ class SkRectToRect; class SkDrawRect : public SkBoundable { DECLARE_DRAW_MEMBER_INFO(Rect); SkDrawRect(); - virtual void dirty() SK_OVERRIDE; - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + void dirty() SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual SkDisplayable* getParent() const SK_OVERRIDE; - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual bool setParent(SkDisplayable* parent) SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + SkDisplayable* getParent() const SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool setParent(SkDisplayable* parent) SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; protected: SkRect fRect; SkDisplayable* fParent; @@ -41,9 +41,9 @@ private: class SkRoundRect : public SkDrawRect { DECLARE_MEMBER_INFO(RoundRect); SkRoundRect(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif protected: SkScalar rx; diff --git a/src/animator/SkDrawSaveLayer.h b/src/animator/SkDrawSaveLayer.h index 50a5a37175..1080e81c9c 100644 --- a/src/animator/SkDrawSaveLayer.h +++ b/src/animator/SkDrawSaveLayer.h @@ -20,11 +20,11 @@ class SkSaveLayer : public SkGroup { DECLARE_MEMBER_INFO(SaveLayer); SkSaveLayer(); virtual ~SkSaveLayer(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; protected: SkDrawPaint* paint; SkDrawRect* bounds; diff --git a/src/animator/SkDrawShader.h b/src/animator/SkDrawShader.h index 43462de491..32c8fd56d8 100644 --- a/src/animator/SkDrawShader.h +++ b/src/animator/SkDrawShader.h @@ -16,8 +16,8 @@ class SkBaseBitmap; class SkDrawBitmapShader : public SkDrawShader { DECLARE_DRAW_MEMBER_INFO(BitmapShader); SkDrawBitmapShader(); - virtual bool add() SK_OVERRIDE; - virtual SkShader* getShader() SK_OVERRIDE; + bool add() SK_OVERRIDE; + SkShader* getShader() SK_OVERRIDE; protected: SkBool filterBitmap; SkBaseBitmap* image; diff --git a/src/animator/SkDrawText.h b/src/animator/SkDrawText.h index d0fb3beb5c..26300072de 100644 --- a/src/animator/SkDrawText.h +++ b/src/animator/SkDrawText.h @@ -17,11 +17,11 @@ class SkText : public SkBoundable { DECLARE_MEMBER_INFO(Text); SkText(); virtual ~SkText(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; const char* getText() { return text.c_str(); } size_t getSize() { return text.size(); } protected: diff --git a/src/animator/SkDrawTextBox.h b/src/animator/SkDrawTextBox.h index 4fa0872c9f..4bb3bf268d 100644 --- a/src/animator/SkDrawTextBox.h +++ b/src/animator/SkDrawTextBox.h @@ -18,12 +18,12 @@ class SkDrawTextBox : public SkDrawRect { SkDrawTextBox(); // overrides - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; private: SkString fText; diff --git a/src/animator/SkDrawTo.h b/src/animator/SkDrawTo.h index 93f9b49c38..0c089d6b4c 100644 --- a/src/animator/SkDrawTo.h +++ b/src/animator/SkDrawTo.h @@ -19,9 +19,9 @@ class SkDrawTo : public SkGroup { DECLARE_MEMBER_INFO(DrawTo); SkDrawTo(); // virtual ~SkDrawTo(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif protected: SkBool drawOnce; diff --git a/src/animator/SkDrawTransparentShader.h b/src/animator/SkDrawTransparentShader.h index 58dc1234ee..b6ab7c73c4 100644 --- a/src/animator/SkDrawTransparentShader.h +++ b/src/animator/SkDrawTransparentShader.h @@ -12,7 +12,7 @@ class SkDrawTransparentShader : public SkDrawShader { DECLARE_EMPTY_MEMBER_INFO(TransparentShader); - virtual SkShader* getShader() SK_OVERRIDE; + SkShader* getShader() SK_OVERRIDE; }; #endif // SkDrawTransparentShader_DEFINED diff --git a/src/animator/SkDump.h b/src/animator/SkDump.h index c2f6d2bf44..86e9e08b7b 100644 --- a/src/animator/SkDump.h +++ b/src/animator/SkDump.h @@ -20,9 +20,9 @@ class SkDump : public SkDisplayable { DECLARE_MEMBER_INFO(Dump); #ifdef SK_DUMP_ENABLED SkDump(); - virtual bool enable(SkAnimateMaker & ) SK_OVERRIDE; + bool enable(SkAnimateMaker & ) SK_OVERRIDE; bool evaluate(SkAnimateMaker &); - virtual bool hasEnable() const SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; static void GetEnumString(SkDisplayTypes , int index, SkString* result); SkBool displayList; SkBool eventList; diff --git a/src/animator/SkHitClear.h b/src/animator/SkHitClear.h index 02b0140f8e..3e09700921 100644 --- a/src/animator/SkHitClear.h +++ b/src/animator/SkHitClear.h @@ -16,8 +16,8 @@ class SkHitClear : public SkDisplayable { DECLARE_MEMBER_INFO(HitClear); - virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool hasEnable() const SK_OVERRIDE; + bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; private: SkTDDisplayableArray targets; }; diff --git a/src/animator/SkHitTest.h b/src/animator/SkHitTest.h index eb9ea4e971..f79dab0ee4 100644 --- a/src/animator/SkHitTest.h +++ b/src/animator/SkHitTest.h @@ -16,10 +16,10 @@ class SkHitTest : public SkADrawable { DECLARE_MEMBER_INFO(HitTest); SkHitTest(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool hasEnable() const SK_OVERRIDE; - virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool hasEnable() const SK_OVERRIDE; + const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; private: SkTDDisplayableArray bullets; SkTDIntArray hits; diff --git a/src/animator/SkMatrixParts.h b/src/animator/SkMatrixParts.h index b0d6fccb8d..e6a8850601 100644 --- a/src/animator/SkMatrixParts.h +++ b/src/animator/SkMatrixParts.h @@ -39,7 +39,7 @@ class SkRotate : public SkMatrixPart { DECLARE_MEMBER_INFO(Rotate); SkRotate(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkScalar degrees; SkPoint center; }; @@ -48,7 +48,7 @@ class SkScale : public SkMatrixPart { DECLARE_MEMBER_INFO(Scale); SkScale(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkScalar x; SkScalar y; SkPoint center; @@ -58,7 +58,7 @@ class SkSkew : public SkMatrixPart { DECLARE_MEMBER_INFO(Skew); SkSkew(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkScalar x; SkScalar y; SkPoint center; @@ -68,7 +68,7 @@ class SkTranslate : public SkMatrixPart { DECLARE_MEMBER_INFO(Translate); SkTranslate(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkScalar x; SkScalar y; }; @@ -78,7 +78,7 @@ class SkFromPath : public SkMatrixPart { SkFromPath(); virtual ~SkFromPath(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; int32_t mode; SkScalar offset; SkDrawPath* path; @@ -90,11 +90,11 @@ class SkRectToRect : public SkMatrixPart { SkRectToRect(); virtual ~SkRectToRect(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; + const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkDrawRect* source; SkDrawRect* destination; }; @@ -104,12 +104,12 @@ class SkPolyToPoly : public SkMatrixPart { SkPolyToPoly(); virtual ~SkPolyToPoly(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; + void dump(SkAnimateMaker* ) SK_OVERRIDE; #endif - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkPolygon* source; SkPolygon* destination; }; diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h index cf4b0a85be..c0d9e2087a 100644 --- a/src/animator/SkMemberInfo.h +++ b/src/animator/SkMemberInfo.h @@ -150,49 +150,49 @@ struct SkMemberInfo { public: \ static const SkMemberInfo fInfo[]; \ static const int fInfoCount; \ - virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ - virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ + const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ + const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ typedef Sk##_type BASE_CLASS #define DECLARE_MEMBER_INFO(_type) \ public: \ static const SkMemberInfo fInfo[]; \ static const int fInfoCount; \ - virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ - virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ - virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \ + const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ + const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ + SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \ typedef Sk##_type BASE_CLASS #define DECLARE_DRAW_MEMBER_INFO(_type) \ public: \ static const SkMemberInfo fInfo[]; \ static const int fInfoCount; \ - virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ - virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ - virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \ + const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ + const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ + SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \ typedef SkDraw##_type BASE_CLASS #define DECLARE_DISPLAY_MEMBER_INFO(_type) \ public: \ static const SkMemberInfo fInfo[]; \ static const int fInfoCount; \ - virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ - virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ - virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \ + const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ + const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ + SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \ typedef SkDisplay##_type BASE_CLASS #define DECLARE_EMPTY_MEMBER_INFO(_type) \ public: \ - virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } + SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } #define DECLARE_EXTRAS_MEMBER_INFO(_type) \ public: \ static const SkMemberInfo fInfo[]; \ static const int fInfoCount; \ - virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ - virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ + const SkMemberInfo* getMember(int index) SK_OVERRIDE; \ + const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \ SkDisplayTypes fType; \ - virtual SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \ + SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \ typedef _type BASE_CLASS #define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \ diff --git a/src/animator/SkPaintPart.h b/src/animator/SkPaintPart.h index 1f5d4ebbd5..a285a1cbef 100644 --- a/src/animator/SkPaintPart.h +++ b/src/animator/SkPaintPart.h @@ -35,14 +35,14 @@ class SkDrawMaskFilter : public SkPaintPart { DECLARE_EMPTY_MEMBER_INFO(MaskFilter); virtual SkMaskFilter* getMaskFilter(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; }; class SkDrawPathEffect : public SkPaintPart { DECLARE_EMPTY_MEMBER_INFO(PathEffect); virtual SkPathEffect* getPathEffect(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; }; class SkDrawShader : public SkPaintPart { @@ -50,7 +50,7 @@ class SkDrawShader : public SkPaintPart { SkDrawShader(); virtual SkShader* getShader(); protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkMatrix* getMatrix(); // returns NULL if matrix is NULL SkDrawMatrix* matrix; int /*SkShader::TileMode*/ tileMode; @@ -60,12 +60,12 @@ class SkDrawTypeface : public SkPaintPart { DECLARE_DRAW_MEMBER_INFO(Typeface); SkDrawTypeface(); #ifdef SK_DUMP_ENABLED - virtual void dump(SkAnimateMaker *) SK_OVERRIDE; + void dump(SkAnimateMaker *) SK_OVERRIDE; #endif SkTypeface* getTypeface() { return SkTypeface::CreateFromName(fontName.c_str(), style); } protected: - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; SkString fontName; SkTypeface::Style style; }; diff --git a/src/animator/SkPathParts.h b/src/animator/SkPathParts.h index 67a8853d34..6aad1baebd 100644 --- a/src/animator/SkPathParts.h +++ b/src/animator/SkPathParts.h @@ -34,7 +34,7 @@ protected: class SkMoveTo : public SkPathPart { DECLARE_MEMBER_INFO(MoveTo); SkMoveTo(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; protected: SkScalar x; SkScalar y; @@ -42,7 +42,7 @@ protected: class SkRMoveTo : public SkMoveTo { DECLARE_MEMBER_INFO(RMoveTo); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: typedef SkMoveTo INHERITED; }; @@ -50,7 +50,7 @@ private: class SkLineTo : public SkPathPart { DECLARE_MEMBER_INFO(LineTo); SkLineTo(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; protected: SkScalar x; SkScalar y; @@ -58,7 +58,7 @@ protected: class SkRLineTo : public SkLineTo { DECLARE_MEMBER_INFO(RLineTo); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: typedef SkLineTo INHERITED; }; @@ -66,7 +66,7 @@ private: class SkQuadTo : public SkPathPart { DECLARE_MEMBER_INFO(QuadTo); SkQuadTo(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; protected: SkScalar x1; SkScalar y1; @@ -76,7 +76,7 @@ protected: class SkRQuadTo : public SkQuadTo { DECLARE_MEMBER_INFO(RQuadTo); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: typedef SkQuadTo INHERITED; }; @@ -84,7 +84,7 @@ private: class SkCubicTo : public SkPathPart { DECLARE_MEMBER_INFO(CubicTo); SkCubicTo(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; protected: SkScalar x1; SkScalar y1; @@ -96,14 +96,14 @@ protected: class SkRCubicTo : public SkCubicTo { DECLARE_MEMBER_INFO(RCubicTo); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: typedef SkCubicTo INHERITED; }; class SkClose : public SkPathPart { DECLARE_EMPTY_MEMBER_INFO(Close); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; }; class SkAddGeom : public SkPathPart { @@ -116,7 +116,7 @@ protected: class SkAddRect : public SkAddGeom { DECLARE_MEMBER_INFO(AddRect); SkAddRect(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; protected: SkRect fRect; private: @@ -125,7 +125,7 @@ private: class SkAddOval : public SkAddRect { DECLARE_MEMBER_INFO(AddOval); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: typedef SkAddRect INHERITED; }; @@ -133,7 +133,7 @@ private: class SkAddCircle : public SkAddGeom { DECLARE_MEMBER_INFO(AddCircle); SkAddCircle(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: SkScalar radius; SkScalar x; @@ -144,7 +144,7 @@ private: class SkAddRoundRect : public SkAddRect { DECLARE_MEMBER_INFO(AddRoundRect); SkAddRoundRect(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: SkScalar rx; SkScalar ry; @@ -154,7 +154,7 @@ private: class SkAddPath : public SkPathPart { DECLARE_MEMBER_INFO(AddPath); SkAddPath(); - virtual bool add() SK_OVERRIDE; + bool add() SK_OVERRIDE; private: typedef SkPathPart INHERITED; SkDrawMatrix* matrix; diff --git a/src/animator/SkPostParts.h b/src/animator/SkPostParts.h index 7c1325826b..f48c33fd8a 100644 --- a/src/animator/SkPostParts.h +++ b/src/animator/SkPostParts.h @@ -18,10 +18,10 @@ class SkDataInput: public SkInput { DECLARE_MEMBER_INFO(DataInput); SkDataInput(); bool add(); - virtual void dirty() SK_OVERRIDE; - virtual SkDisplayable* getParent() const SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; - virtual bool setParent(SkDisplayable* ) SK_OVERRIDE; + void dirty() SK_OVERRIDE; + SkDisplayable* getParent() const SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + bool setParent(SkDisplayable* ) SK_OVERRIDE; protected: SkPost* fParent; typedef SkInput INHERITED; diff --git a/src/animator/SkSnapshot.h b/src/animator/SkSnapshot.h index 43f1669226..e3b36d1898 100644 --- a/src/animator/SkSnapshot.h +++ b/src/animator/SkSnapshot.h @@ -18,7 +18,7 @@ class SkSnapshot: public SkADrawable { DECLARE_MEMBER_INFO(Snapshot); SkSnapshot(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: SkString filename; SkScalar quality; diff --git a/src/animator/SkTextOnPath.h b/src/animator/SkTextOnPath.h index 9c55284a4c..fb1f6f287c 100644 --- a/src/animator/SkTextOnPath.h +++ b/src/animator/SkTextOnPath.h @@ -19,7 +19,7 @@ class SkText; class SkTextOnPath : public SkBoundable { DECLARE_MEMBER_INFO(TextOnPath); SkTextOnPath(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; private: SkScalar offset; SkDrawPath* path; diff --git a/src/animator/SkTextToPath.h b/src/animator/SkTextToPath.h index 01c6601d10..2be67ad7b7 100644 --- a/src/animator/SkTextToPath.h +++ b/src/animator/SkTextToPath.h @@ -20,8 +20,8 @@ class SkText; class SkTextToPath : public SkADrawable { DECLARE_MEMBER_INFO(TextToPath); SkTextToPath(); - virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + bool draw(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; private: SkDrawPaint* paint; SkDrawPath* path; diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp index e2c1b12d07..45e6cc3ae6 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp @@ -1273,13 +1273,13 @@ public: Instead we'll rely on the runtime asserts to guarantee Y monotonicity; any failure cases that misses may have minor artifacts. */ - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { this->recordMinY(y); fBuilder->addColumn(x, y, alpha, height); fLastY = y + height - 1; } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { this->recordMinY(y); this->checkForYGap(y); fBuilder->addRectRun(x, y, width, height); @@ -1294,14 +1294,14 @@ public: fLastY = y + height - 1; } - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE { unexpected(); } - virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE { + const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE { return NULL; } - virtual void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) SK_OVERRIDE { this->recordMinY(y); this->checkForYGap(y); fBuilder->addRun(x, y, 0xFF, width); diff --git a/src/core/SkAAClip.h b/src/core/SkAAClip.h index 45cc54932d..67f45e4946 100644 --- a/src/core/SkAAClip.h +++ b/src/core/SkAAClip.h @@ -109,13 +109,13 @@ public: fAAClipBounds = aaclip->getBounds(); } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; private: SkBlitter* fBlitter; diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp index 193a5ae536..3af582232b 100644 --- a/src/core/SkBitmapCache.cpp +++ b/src/core/SkBitmapCache.cpp @@ -61,8 +61,8 @@ struct BitmapRec : public SkResourceCache::Rec { BitmapKey fKey; SkBitmap fBitmap; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fBitmap.getSize(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fBitmap.getSize(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextBitmap) { const BitmapRec& rec = static_cast<const BitmapRec&>(baseRec); @@ -139,8 +139,8 @@ struct MipMapRec : public SkResourceCache::Rec { fMipMap->detachFromCacheAndUnref(); } - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fMipMap->size(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fMipMap->size(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextMip) { const MipMapRec& rec = static_cast<const MipMapRec&>(baseRec); diff --git a/src/core/SkBitmapFilter.h b/src/core/SkBitmapFilter.h index 8ef0f6e1de..139e990a10 100644 --- a/src/core/SkBitmapFilter.h +++ b/src/core/SkBitmapFilter.h @@ -79,7 +79,7 @@ class SkMitchellFilter: public SkBitmapFilter { : SkBitmapFilter(width), B(b), C(c) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { x = fabsf(x); if (x > 2.f) { return 0; @@ -102,7 +102,7 @@ class SkGaussianFilter: public SkBitmapFilter { : SkBitmapFilter(width), alpha(a), expWidth(expf(-alpha * width * width)) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { return SkTMax(0.f, float(expf(-alpha*x*x) - expWidth)); } protected: @@ -115,7 +115,7 @@ class SkTriangleFilter: public SkBitmapFilter { : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { return SkTMax(0.f, fWidth - fabsf(x)); } protected: @@ -127,7 +127,7 @@ class SkBoxFilter: public SkBitmapFilter { : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { return (x >= -fWidth && x < fWidth) ? 1.0f : 0.0f; } protected: @@ -138,7 +138,7 @@ public: SkHammingFilter(float width=1.f) : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { if (x <= -fWidth || x >= fWidth) { return 0.0f; // Outside of the window. } @@ -158,7 +158,7 @@ class SkLanczosFilter: public SkBitmapFilter { : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { if (x <= -fWidth || x >= fWidth) { return 0.0f; // Outside of the window. } diff --git a/src/core/SkBitmapHeap.h b/src/core/SkBitmapHeap.h index 148ae132a4..95e272418a 100644 --- a/src/core/SkBitmapHeap.h +++ b/src/core/SkBitmapHeap.h @@ -117,7 +117,7 @@ public: * * @return The bitmap located at that slot or NULL if external storage is being used. */ - virtual SkBitmap* getBitmap(int32_t slot) const SK_OVERRIDE { + SkBitmap* getBitmap(int32_t slot) const SK_OVERRIDE { SkASSERT(fExternalStorage == NULL); SkBitmapHeapEntry* entry = getEntry(slot); if (entry) { @@ -131,7 +131,7 @@ public: * * @return The bitmap located at that slot or NULL if external storage is being used. */ - virtual void releaseRef(int32_t slot) SK_OVERRIDE { + void releaseRef(int32_t slot) SK_OVERRIDE { SkASSERT(fExternalStorage == NULL); if (fOwnerCount != IGNORE_OWNERS) { SkBitmapHeapEntry* entry = getEntry(slot); diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h index ab00c11e39..f73d56f2fb 100644 --- a/src/core/SkBitmapProcShader.h +++ b/src/core/SkBitmapProcShader.h @@ -20,10 +20,10 @@ public: const SkMatrix* localMatrix = NULL); // overrides from SkShader - virtual bool isOpaque() const SK_OVERRIDE; - virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; + bool isOpaque() const SK_OVERRIDE; + BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; static bool CanDo(const SkBitmap&, TileMode tx, TileMode ty); @@ -41,11 +41,11 @@ public: BitmapProcShaderContext(const SkBitmapProcShader&, const ContextRec&, SkBitmapProcState*); virtual ~BitmapProcShaderContext(); - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; - virtual ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; - virtual uint32_t getFlags() const SK_OVERRIDE { return fFlags; } + uint32_t getFlags() const SK_OVERRIDE { return fFlags; } private: SkBitmapProcState* fState; @@ -55,8 +55,8 @@ public: }; protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; SkBitmap fRawBitmap; // experimental for RLE encoding uint8_t fTileModeX, fTileModeY; diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index 5bb7ac8d01..a5d2b0598b 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -580,7 +580,7 @@ public: SkSafeUnref(fProxy); } - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { size_t size = sizeof(Sk3DShaderContext); if (fProxy) { size += fProxy->contextSize(); @@ -588,7 +588,7 @@ public: return size; } - virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { + Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { SkShader::Context* proxyContext = NULL; if (fProxy) { char* proxyContextStorage = (char*) storage + sizeof(Sk3DShaderContext); @@ -620,9 +620,9 @@ public: } } - virtual void set3DMask(const SkMask* mask) SK_OVERRIDE { fMask = mask; } + void set3DMask(const SkMask* mask) SK_OVERRIDE { fMask = mask; } - virtual void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE { + void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE { if (fProxyContext) { fProxyContext->shadeSpan(x, y, span, count); } @@ -697,7 +697,7 @@ public: }; #ifndef SK_IGNORE_TO_STRING - virtual void toString(SkString* str) const SK_OVERRIDE { + void toString(SkString* str) const SK_OVERRIDE { str->append("Sk3DShader: ("); if (fProxy) { @@ -714,7 +714,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk3DShader) protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { buffer.writeFlattenable(fProxy); } @@ -736,7 +736,7 @@ public: , fShaderContext(shaderContext) {} - virtual void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) SK_OVERRIDE { fProxy->blitH(x, y, width); } @@ -745,15 +745,15 @@ public: fProxy->blitAntiH(x, y, antialias, runs); } - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { fProxy->blitV(x, y, height, alpha); } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { fProxy->blitRect(x, y, width, height); } - virtual void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE { + void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE { if (mask.fFormat == SkMask::k3D_Format) { fShaderContext->set3DMask(&mask); @@ -991,7 +991,7 @@ public: // Override rec with the identity matrix, so it is guaranteed to be invertible. : INHERITED(shader, SkShader::ContextRec(*rec.fDevice, *rec.fPaint, SkMatrix::I())) {} - virtual void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE { + void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE { sk_bzero(colors, count * sizeof(SkPMColor)); } diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h index e0e77cc6be..b0745c8a27 100644 --- a/src/core/SkBlitter.h +++ b/src/core/SkBlitter.h @@ -119,14 +119,14 @@ private: */ class SkNullBlitter : public SkBlitter { public: - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; - virtual bool isNullBlitter() const SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + bool isNullBlitter() const SK_OVERRIDE; }; /** Wraps another (real) blitter, and ensures that the real blitter is only @@ -141,21 +141,21 @@ public: fClipRect = clipRect; } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitAntiRect(int x, int y, int width, int height, SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; - virtual int requestRowsPreserved() const SK_OVERRIDE { + int requestRowsPreserved() const SK_OVERRIDE { return fBlitter->requestRowsPreserved(); } - virtual void* allocBlitMemory(size_t sz) SK_OVERRIDE { + void* allocBlitMemory(size_t sz) SK_OVERRIDE { return fBlitter->allocBlitMemory(sz); } @@ -176,21 +176,21 @@ public: fRgn = clipRgn; } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitAntiRect(int x, int y, int width, int height, SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; - virtual int requestRowsPreserved() const SK_OVERRIDE { + int requestRowsPreserved() const SK_OVERRIDE { return fBlitter->requestRowsPreserved(); } - virtual void* allocBlitMemory(size_t sz) SK_OVERRIDE { + void* allocBlitMemory(size_t sz) SK_OVERRIDE { return fBlitter->allocBlitMemory(sz); } diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp index f8d663ff2f..7c30fb1ee0 100644 --- a/src/core/SkBlitter_RGB16.cpp +++ b/src/core/SkBlitter_RGB16.cpp @@ -59,14 +59,14 @@ void sk_dither_memset16(uint16_t dst[], uint16_t value, uint16_t other, class SkRGB16_Blitter : public SkRasterBlitter { public: SkRGB16_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; protected: SkPMColor fSrcColor32; @@ -86,11 +86,11 @@ protected: class SkRGB16_Opaque_Blitter : public SkRGB16_Blitter { public: SkRGB16_Opaque_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; @@ -102,7 +102,7 @@ private: class SkRGB16_Black_Blitter : public SkRGB16_Opaque_Blitter { public: SkRGB16_Black_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; @@ -116,10 +116,10 @@ public: SkRGB16_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); virtual ~SkRGB16_Shader_Blitter(); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; protected: SkPMColor* fBuffer; @@ -138,10 +138,10 @@ class SkRGB16_Shader16_Blitter : public SkRGB16_Shader_Blitter { public: SkRGB16_Shader16_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; private: typedef SkRGB16_Shader_Blitter INHERITED; @@ -152,7 +152,7 @@ public: SkRGB16_Shader_Xfermode_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); virtual ~SkRGB16_Shader_Xfermode_Blitter(); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; diff --git a/src/core/SkBuffer.h b/src/core/SkBuffer.h index 9791cf55a1..96e225be3a 100644 --- a/src/core/SkBuffer.h +++ b/src/core/SkBuffer.h @@ -105,7 +105,7 @@ public: null and the number of bytes to read does not overflow this object's data, copy those bytes into buffer. */ - virtual bool read(void* buffer, size_t size) SK_OVERRIDE; + bool read(void* buffer, size_t size) SK_OVERRIDE; /** Returns whether or not a read operation attempted to read past the end of the data. */ diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h index e024718623..9fbd5e1e8e 100644 --- a/src/core/SkColorShader.h +++ b/src/core/SkColorShader.h @@ -23,9 +23,9 @@ public: */ explicit SkColorShader(SkColor c); - virtual bool isOpaque() const SK_OVERRIDE; + bool isOpaque() const SK_OVERRIDE; - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { return sizeof(ColorShaderContext); } @@ -33,11 +33,11 @@ public: public: ColorShaderContext(const SkColorShader& shader, const ContextRec&); - virtual uint32_t getFlags() const SK_OVERRIDE; - virtual uint8_t getSpan16Alpha() const SK_OVERRIDE; - virtual void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; - virtual void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; + uint8_t getSpan16Alpha() const SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; + void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE; private: SkPMColor fPMColor; @@ -52,7 +52,7 @@ public: SkMatrix* outMatrix, TileMode xy[2]) const SK_OVERRIDE; - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; + GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, GrColor*, @@ -63,9 +63,9 @@ public: protected: SkColorShader(SkReadBuffer&); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; - virtual bool onAsLuminanceColor(SkColor* lum) const SK_OVERRIDE { + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + bool onAsLuminanceColor(SkColor* lum) const SK_OVERRIDE { *lum = fColor; return true; } diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h index 20f9437ac8..60211c98b3 100644 --- a/src/core/SkCoreBlitters.h +++ b/src/core/SkCoreBlitters.h @@ -41,9 +41,9 @@ public: * Will create the context at the same location as the old one (this is safe * because the shader itself is unchanged). */ - virtual bool resetShaderContext(const SkShader::ContextRec&) SK_OVERRIDE; + bool resetShaderContext(const SkShader::ContextRec&) SK_OVERRIDE; - virtual SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; } + SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; } protected: uint32_t fShaderFlags; @@ -62,12 +62,12 @@ private: class SkA8_Coverage_Blitter : public SkRasterBlitter { public: SkA8_Coverage_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; - virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; + void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; }; class SkA8_Blitter : public SkRasterBlitter { @@ -161,11 +161,11 @@ public: SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); virtual ~SkARGB32_Shader_Blitter(); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; private: SkXfermode* fXfermode; diff --git a/src/core/SkDeviceImageFilterProxy.h b/src/core/SkDeviceImageFilterProxy.h index 621ff3f507..0ae686d877 100644 --- a/src/core/SkDeviceImageFilterProxy.h +++ b/src/core/SkDeviceImageFilterProxy.h @@ -22,13 +22,13 @@ public: props.pixelGeometry())) {} - virtual SkBaseDevice* createDevice(int w, int h) SK_OVERRIDE { + SkBaseDevice* createDevice(int w, int h) SK_OVERRIDE { SkBaseDevice::CreateInfo cinfo(SkImageInfo::MakeN32Premul(w, h), SkBaseDevice::kImageFilter_Usage, kUnknown_SkPixelGeometry); return fDevice->onCreateCompatibleDevice(cinfo); } - virtual bool canHandleImageFilter(const SkImageFilter* filter) SK_OVERRIDE { + bool canHandleImageFilter(const SkImageFilter* filter) SK_OVERRIDE { return fDevice->canHandleImageFilter(filter); } virtual bool filterImage(const SkImageFilter* filter, const SkBitmap& src, @@ -37,7 +37,7 @@ public: return fDevice->filterImage(filter, src, ctx, result, offset); } - virtual const SkSurfaceProps* surfaceProps() const SK_OVERRIDE { + const SkSurfaceProps* surfaceProps() const SK_OVERRIDE { return &fProps; } diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 1e1ce07631..60075322b6 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -2016,7 +2016,7 @@ class SkTriColorShader : public SkShader { public: SkTriColorShader() {} - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class TriColorShaderContext : public SkShader::Context { public: @@ -2025,7 +2025,7 @@ public: bool setup(const SkPoint pts[], const SkColor colors[], int, int, int); - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; private: SkMatrix fDstToUnit; @@ -2040,7 +2040,7 @@ public: Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; } protected: - virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { + Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { return SkNEW_PLACEMENT_ARGS(storage, TriColorShaderContext, (*this, rec)); } diff --git a/src/core/SkEmptyShader.h b/src/core/SkEmptyShader.h index b7fefbe109..0de85caf5b 100644 --- a/src/core/SkEmptyShader.h +++ b/src/core/SkEmptyShader.h @@ -20,7 +20,7 @@ class SK_API SkEmptyShader : public SkShader { public: SkEmptyShader() {} - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { // Even though createContext returns NULL we have to return a value of at least // sizeof(SkShader::Context) to satisfy SkSmallAllocator. return sizeof(SkShader::Context); @@ -30,7 +30,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader) protected: - virtual SkShader::Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE { + SkShader::Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE { return NULL; } diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h index 44c2632711..dca9567e66 100644 --- a/src/core/SkFilterShader.h +++ b/src/core/SkFilterShader.h @@ -17,7 +17,7 @@ public: SkFilterShader(SkShader* shader, SkColorFilter* filter); virtual ~SkFilterShader(); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class FilterShaderContext : public SkShader::Context { public: @@ -25,12 +25,12 @@ public: FilterShaderContext(const SkFilterShader&, SkShader::Context*, const ContextRec&); virtual ~FilterShaderContext(); - virtual uint32_t getFlags() const SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; - virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; - virtual void set3DMask(const SkMask* mask) SK_OVERRIDE { + void set3DMask(const SkMask* mask) SK_OVERRIDE { // forward to our proxy fShaderContext->set3DMask(mask); } @@ -45,8 +45,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFilterShader) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp index 79b7b7302e..8092a590c2 100644 --- a/src/core/SkFontHost.cpp +++ b/src/core/SkFontHost.cpp @@ -80,15 +80,15 @@ SkFontStyle::SkFontStyle(unsigned oldStyle) { class SkEmptyFontStyleSet : public SkFontStyleSet { public: - virtual int count() SK_OVERRIDE { return 0; } - virtual void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE { + int count() SK_OVERRIDE { return 0; } + void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE { SkDEBUGFAIL("SkFontStyleSet::getStyle called on empty set"); } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { SkDEBUGFAIL("SkFontStyleSet::createTypeface called on empty set"); return NULL; } - virtual SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE { return NULL; } }; @@ -101,17 +101,17 @@ SkFontStyleSet* SkFontStyleSet::CreateEmpty() { class SkEmptyFontMgr : public SkFontMgr { protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return 0; } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { SkDEBUGFAIL("onGetFamilyName called with bad index"); } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { SkDEBUGFAIL("onCreateStyleSet called with bad index"); return NULL; } - virtual SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE { return SkFontStyleSet::CreateEmpty(); } @@ -130,16 +130,16 @@ protected: const SkFontStyle&) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE { + SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE { return NULL; } }; diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 3285e220de..34b1b9bc3e 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -432,7 +432,7 @@ public: } SK_DECLARE_INTERNAL_LLIST_INTERFACE(Value); }; - virtual bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE { + bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE { SkAutoMutexAcquire mutex(fMutex); if (Value* v = fLookup.find(key)) { *result = v->fBitmap; @@ -445,7 +445,7 @@ public: } return false; } - virtual void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE { + void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE { SkAutoMutexAcquire mutex(fMutex); if (Value* v = fLookup.find(key)) { removeInternal(v); diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h index 0a5cb7a71b..be78bee110 100644 --- a/src/core/SkLocalMatrixShader.h +++ b/src/core/SkLocalMatrixShader.h @@ -19,7 +19,7 @@ public: , fProxyShader(SkRef(proxy)) {} - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { return fProxyShader->contextSize(); } @@ -28,7 +28,7 @@ public: return fProxyShader->asABitmap(bitmap, matrix, mode); } - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { + GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { return fProxyShader->asAGradient(info); } @@ -55,7 +55,7 @@ public: #endif - virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE { + SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE { if (localMatrix) { *localMatrix = this->getLocalMatrix(); } @@ -66,8 +66,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; private: SkAutoTUnref<SkShader> fProxyShader; diff --git a/src/core/SkMaskCache.cpp b/src/core/SkMaskCache.cpp index b4b8b4faf3..a360fc56d7 100644 --- a/src/core/SkMaskCache.cpp +++ b/src/core/SkMaskCache.cpp @@ -51,8 +51,8 @@ struct RRectBlurRec : public SkResourceCache::Rec { RRectBlurKey fKey; MaskValue fValue; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) { const RRectBlurRec& rec = static_cast<const RRectBlurRec&>(baseRec); @@ -142,8 +142,8 @@ struct RectsBlurRec : public SkResourceCache::Rec { RectsBlurKey fKey; MaskValue fValue; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) { const RectsBlurRec& rec = static_cast<const RectsBlurRec&>(baseRec); diff --git a/src/core/SkMaskGamma.cpp b/src/core/SkMaskGamma.cpp index a305d72162..abc729baae 100644 --- a/src/core/SkMaskGamma.cpp +++ b/src/core/SkMaskGamma.cpp @@ -12,27 +12,27 @@ #include "SkMaskGamma.h" class SkLinearColorSpaceLuminance : public SkColorSpaceLuminance { - virtual SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { + SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { SkASSERT(SK_Scalar1 == gamma); return luminance; } - virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { + SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { SkASSERT(SK_Scalar1 == gamma); return luma; } }; class SkGammaColorSpaceLuminance : public SkColorSpaceLuminance { - virtual SkScalar toLuma(SkScalar gamma, SkScalar luminance) const SK_OVERRIDE { + SkScalar toLuma(SkScalar gamma, SkScalar luminance) const SK_OVERRIDE { return SkScalarPow(luminance, gamma); } - virtual SkScalar fromLuma(SkScalar gamma, SkScalar luma) const SK_OVERRIDE { + SkScalar fromLuma(SkScalar gamma, SkScalar luma) const SK_OVERRIDE { return SkScalarPow(luma, SkScalarInvert(gamma)); } }; class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance { - virtual SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { + SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { SkASSERT(0 == gamma); //The magic numbers are derived from the sRGB specification. //See http://www.color.org/chardata/rgb/srgb.xalter . @@ -42,7 +42,7 @@ class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance { return SkScalarPow((luminance + 0.055f) / 1.055f, 2.4f); } - virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { + SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { SkASSERT(0 == gamma); //The magic numbers are derived from the sRGB specification. //See http://www.color.org/chardata/rgb/srgb.xalter . diff --git a/src/core/SkMipMap.h b/src/core/SkMipMap.h index 4e83b12b3e..d4039687c0 100644 --- a/src/core/SkMipMap.h +++ b/src/core/SkMipMap.h @@ -30,7 +30,7 @@ public: bool extractLevel(SkScalar scale, Level*) const; protected: - virtual void onDataChange(void* oldData, void* newData) SK_OVERRIDE { + void onDataChange(void* oldData, void* newData) SK_OVERRIDE { fLevels = (Level*)newData; // could be NULL } diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h index ca2c13329c..3ce0007a3c 100644 --- a/src/core/SkPictureRecord.h +++ b/src/core/SkPictureRecord.h @@ -29,9 +29,9 @@ public: SkPictureRecord(const SkISize& dimensions, uint32_t recordFlags); virtual ~SkPictureRecord(); - virtual void beginCommentGroup(const char* description) SK_OVERRIDE; - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; - virtual void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) SK_OVERRIDE; + void addComment(const char* kywd, const char* value) SK_OVERRIDE; + void endCommentGroup() SK_OVERRIDE; const SkTDArray<const SkPicture* >& getPictureRefs() const { return fPictureRefs; @@ -146,19 +146,19 @@ protected: SkASSERT(fWriter.bytesWritten() == initialOffset + size); } - virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; + SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; const void* onPeekPixels(SkImageInfo*, size_t*) SK_OVERRIDE { return NULL; } - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; @@ -199,12 +199,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; int addPathToHeap(const SkPath& path); // does not write to ops stream diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index b602294a09..5a1e61849d 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -70,8 +70,8 @@ struct BitmapShaderRec : public SkResourceCache::Rec { SkAutoTUnref<SkShader> fShader; size_t fBitmapBytes; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(SkShader) + fBitmapBytes; } diff --git a/src/core/SkPictureShader.h b/src/core/SkPictureShader.h index 5f8cc01aad..8df9f539b8 100644 --- a/src/core/SkPictureShader.h +++ b/src/core/SkPictureShader.h @@ -25,7 +25,7 @@ public: const SkRect*); virtual ~SkPictureShader(); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader) @@ -35,8 +35,8 @@ public: protected: SkPictureShader(SkReadBuffer&); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: SkPictureShader(const SkPicture*, TileMode, TileMode, const SkMatrix*, const SkRect*); @@ -54,11 +54,11 @@ private: virtual ~PictureShaderContext(); - virtual uint32_t getFlags() const SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; - virtual ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE; - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; + ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; private: PictureShaderContext(const SkPictureShader&, const ContextRec&, SkShader* bitmapShader); diff --git a/src/core/SkRTree.h b/src/core/SkRTree.h index 4021c0980b..7934324b5d 100644 --- a/src/core/SkRTree.h +++ b/src/core/SkRTree.h @@ -41,9 +41,9 @@ public: explicit SkRTree(SkScalar aspectRatio = 1); virtual ~SkRTree() {} - virtual void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE; - virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE; - virtual size_t bytesUsed() const SK_OVERRIDE; + void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE; + void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE; + size_t bytesUsed() const SK_OVERRIDE; // Methods and constants below here are only public for tests. diff --git a/src/core/SkRegion_path.cpp b/src/core/SkRegion_path.cpp index c3c0423888..e9224d824e 100644 --- a/src/core/SkRegion_path.cpp +++ b/src/core/SkRegion_path.cpp @@ -43,7 +43,7 @@ public: void copyToRect(SkIRect*) const; void copyToRgn(SkRegion::RunType runs[]) const; - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; #ifdef SK_DEBUG void dump() const { diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp index ae8412d8b4..efcff26c1a 100644 --- a/src/core/SkResourceCache.cpp +++ b/src/core/SkResourceCache.cpp @@ -73,9 +73,9 @@ public: ~SkOneShotDiscardablePixelRef(); protected: - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; - virtual void onUnlockPixels() SK_OVERRIDE; - virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE; + bool onNewLockPixels(LockRec*) SK_OVERRIDE; + void onUnlockPixels() SK_OVERRIDE; + size_t getAllocatedSizeInBytes() const SK_OVERRIDE; private: SkDiscardableMemory* fDM; @@ -143,7 +143,7 @@ public: fFactory = factory; } - virtual bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE; + bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE; private: SkResourceCache::DiscardableFactory fFactory; diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index 771db50425..dad8e5eb21 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -856,21 +856,21 @@ public: : SkScalerContext(face, desc) {} protected: - virtual unsigned generateGlyphCount() SK_OVERRIDE { + unsigned generateGlyphCount() SK_OVERRIDE { return 0; } - virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE { + uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE { return 0; } - virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE { + void generateAdvance(SkGlyph* glyph) SK_OVERRIDE { glyph->zeroMetrics(); } - virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE { + void generateMetrics(SkGlyph* glyph) SK_OVERRIDE { glyph->zeroMetrics(); } - virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE {} - virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {} - virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE { + void generateImage(const SkGlyph& glyph) SK_OVERRIDE {} + void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {} + void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE { if (metrics) { sk_bzero(metrics, sizeof(*metrics)); } diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp index 545a70129e..4329ef5273 100644 --- a/src/core/SkScan_AntiPath.cpp +++ b/src/core/SkScan_AntiPath.cpp @@ -53,7 +53,7 @@ public: SkDEBUGFAIL("How did I get here?"); } /// May not be called on BaseSuperBlitter because it blits out of order. - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { SkDEBUGFAIL("How did I get here?"); } @@ -120,10 +120,10 @@ public: /// Blits a row of pixels, with location and width specified /// in supersampled coordinates. - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; /// Blits a rectangle of pixels, with location and size specified /// in supersampled coordinates. - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; private: // The next three variables are used to track a circular buffer that @@ -408,7 +408,7 @@ public: fRealBlitter->blitMask(fMask, fClipRect); } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; static bool CanHandleRect(const SkIRect& bounds) { #ifdef FORCE_RLE diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp index e31f66cc56..d0341510a9 100644 --- a/src/core/SkScan_Antihair.cpp +++ b/src/core/SkScan_Antihair.cpp @@ -106,7 +106,7 @@ private: class HLine_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE { + SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE { fy += SK_Fixed1/2; int y = fy >> 16; @@ -153,7 +153,7 @@ public: class Horish_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE { + SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE { int16_t runs[2]; uint8_t aa[1]; @@ -186,7 +186,7 @@ public: return fy - SK_Fixed1/2; } - virtual SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE { + SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE { SkASSERT(x < stopx); int16_t runs[2]; @@ -224,7 +224,7 @@ public: class VLine_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { + SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { SkASSERT(0 == dx); fx += SK_Fixed1/2; @@ -243,7 +243,7 @@ public: return fx - SK_Fixed1/2; } - virtual SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { + SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { SkASSERT(y < stopy); SkASSERT(0 == dx); fx += SK_Fixed1/2; @@ -265,7 +265,7 @@ public: class Vertish_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { + SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { int16_t runs[3]; uint8_t aa[2]; @@ -289,7 +289,7 @@ public: return fx - SK_Fixed1/2; } - virtual SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { + SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { SkASSERT(y < stopy); int16_t runs[3]; uint8_t aa[2]; diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp index 84794c63e6..5d9e0ca2a6 100644 --- a/src/core/SkScan_Path.cpp +++ b/src/core/SkScan_Path.cpp @@ -332,7 +332,7 @@ public: } // overrides - virtual void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) SK_OVERRIDE { int invWidth = x - fPrevX; if (invWidth > 0) { fBlitter->blitH(fPrevX, y, invWidth); @@ -341,19 +341,19 @@ public: } // we do not expect to get called with these entrypoints - virtual void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE { + void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE { SkDEBUGFAIL("blitAntiH unexpected"); } - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { SkDEBUGFAIL("blitV unexpected"); } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkDEBUGFAIL("blitRect unexpected"); } - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE { + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE { SkDEBUGFAIL("blitMask unexpected"); } - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE { + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE { SkDEBUGFAIL("justAnOpaqueColor unexpected"); return NULL; } diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp index 0d0d6d0994..0993a4c7ee 100644 --- a/src/core/SkSpriteBlitter_ARGB32.cpp +++ b/src/core/SkSpriteBlitter_ARGB32.cpp @@ -34,7 +34,7 @@ public: fAlpha = alpha; } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y); const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft, @@ -122,7 +122,7 @@ public: Sprite_D32_S32A_XferFilter(const SkBitmap& source, const SkPaint& paint) : Sprite_D32_XferFilter(source, paint) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y); const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft, @@ -169,7 +169,7 @@ public: Sprite_D32_S4444_XferFilter(const SkBitmap& source, const SkPaint& paint) : Sprite_D32_XferFilter(source, paint) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y); const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft, @@ -216,7 +216,7 @@ class Sprite_D32_S4444_Opaque : public SkSpriteBlitter { public: Sprite_D32_S4444_Opaque(const SkBitmap& source) : SkSpriteBlitter(source) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y); const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft, @@ -245,7 +245,7 @@ class Sprite_D32_S4444 : public SkSpriteBlitter { public: Sprite_D32_S4444(const SkBitmap& source) : SkSpriteBlitter(source) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y); const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft, diff --git a/src/core/SkSpriteBlitter_RGB16.cpp b/src/core/SkSpriteBlitter_RGB16.cpp index 3ac5127bd7..2f257a0b0e 100644 --- a/src/core/SkSpriteBlitter_RGB16.cpp +++ b/src/core/SkSpriteBlitter_RGB16.cpp @@ -54,7 +54,7 @@ public: : SkSpriteBlitter(source) {} // overrides - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y); const uint16_t* SK_RESTRICT src = fSource->getAddr16(x - fLeft, y - fTop); @@ -281,7 +281,7 @@ public: fProc = SkBlitRow::Factory(flags, kRGB_565_SkColorType); } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y); const SkPMColor* SK_RESTRICT src = fSource->getAddr32(x - fLeft, y - fTop); diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp index fe6728d7c2..2b190b0e7b 100644 --- a/src/core/SkStream.cpp +++ b/src/core/SkStream.cpp @@ -674,7 +674,7 @@ public: : fBlockMemory(SkRef(headRef)), fCurrent(fBlockMemory->fHead) , fSize(size) , fOffset(0), fCurrentOffset(0) { } - virtual size_t read(void* buffer, size_t rawCount) SK_OVERRIDE { + size_t read(void* buffer, size_t rawCount) SK_OVERRIDE { size_t count = rawCount; if (fOffset + count > fSize) { count = fSize - fOffset; @@ -700,26 +700,26 @@ public: return 0; } - virtual bool isAtEnd() const SK_OVERRIDE { + bool isAtEnd() const SK_OVERRIDE { return fOffset == fSize; } - virtual bool rewind() SK_OVERRIDE { + bool rewind() SK_OVERRIDE { fCurrent = fBlockMemory->fHead; fOffset = 0; fCurrentOffset = 0; return true; } - virtual SkBlockMemoryStream* duplicate() const SK_OVERRIDE { + SkBlockMemoryStream* duplicate() const SK_OVERRIDE { return SkNEW_ARGS(SkBlockMemoryStream, (fBlockMemory.get(), fSize)); } - virtual size_t getPosition() const SK_OVERRIDE { + size_t getPosition() const SK_OVERRIDE { return fOffset; } - virtual bool seek(size_t position) SK_OVERRIDE { + bool seek(size_t position) SK_OVERRIDE { // If possible, skip forward. if (position >= fOffset) { size_t skipAmount = position - fOffset; @@ -736,11 +736,11 @@ public: return this->rewind() && this->skip(position) == position; } - virtual bool move(long offset) SK_OVERRIDE { + bool move(long offset) SK_OVERRIDE { return seek(fOffset + offset); } - virtual SkBlockMemoryStream* fork() const SK_OVERRIDE { + SkBlockMemoryStream* fork() const SK_OVERRIDE { SkAutoTUnref<SkBlockMemoryStream> that(this->duplicate()); that->fCurrent = this->fCurrent; that->fOffset = this->fOffset; @@ -748,11 +748,11 @@ public: return that.detach(); } - virtual size_t getLength() const SK_OVERRIDE { + size_t getLength() const SK_OVERRIDE { return fSize; } - virtual const void* getMemoryBase() SK_OVERRIDE { + const void* getMemoryBase() SK_OVERRIDE { if (NULL == fBlockMemory->fHead->fNext) { return fBlockMemory->fHead->start(); } diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index 02d2bc89c0..75ff58eea8 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -29,15 +29,15 @@ public: protected: SkEmptyTypeface() : SkTypeface(SkFontStyle(), 0, true) { } - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; } - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; } + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE { return NULL; } - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { } + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { } virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t*, uint32_t) const SK_OVERRIDE { return NULL; } - virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { } + void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { } virtual int onCharsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE { if (glyphs && glyphCount > 0) { @@ -45,20 +45,20 @@ protected: } return 0; } - virtual int onCountGlyphs() const SK_OVERRIDE { return 0; }; - virtual int onGetUPEM() const SK_OVERRIDE { return 0; }; + int onCountGlyphs() const SK_OVERRIDE { return 0; }; + int onGetUPEM() const SK_OVERRIDE { return 0; }; class EmptyLocalizedStrings : public SkTypeface::LocalizedStrings { public: - virtual bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; } + bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; } }; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { familyName->reset(); } - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE { + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE { return SkNEW(EmptyLocalizedStrings); }; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; } - virtual size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE { + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; } + size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE { return 0; } }; diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h index 5cf3abed68..916bed4d75 100644 --- a/src/core/SkValidatingReadBuffer.h +++ b/src/core/SkValidatingReadBuffer.h @@ -23,48 +23,48 @@ public: SkValidatingReadBuffer(const void* data, size_t size); virtual ~SkValidatingReadBuffer(); - virtual const void* skip(size_t size) SK_OVERRIDE; + const void* skip(size_t size) SK_OVERRIDE; // primitives - virtual bool readBool() SK_OVERRIDE; - virtual SkColor readColor() SK_OVERRIDE; - virtual SkFixed readFixed() SK_OVERRIDE; - virtual int32_t readInt() SK_OVERRIDE; - virtual SkScalar readScalar() SK_OVERRIDE; - virtual uint32_t readUInt() SK_OVERRIDE; - virtual int32_t read32() SK_OVERRIDE; + bool readBool() SK_OVERRIDE; + SkColor readColor() SK_OVERRIDE; + SkFixed readFixed() SK_OVERRIDE; + int32_t readInt() SK_OVERRIDE; + SkScalar readScalar() SK_OVERRIDE; + uint32_t readUInt() SK_OVERRIDE; + int32_t read32() SK_OVERRIDE; // strings -- the caller is responsible for freeing the string contents - virtual void readString(SkString* string) SK_OVERRIDE; - virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE; + void readString(SkString* string) SK_OVERRIDE; + void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE; // common data structures - virtual SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE; - virtual void skipFlattenable() SK_OVERRIDE; - virtual void readPoint(SkPoint* point) SK_OVERRIDE; - virtual void readMatrix(SkMatrix* matrix) SK_OVERRIDE; - virtual void readIRect(SkIRect* rect) SK_OVERRIDE; - virtual void readRect(SkRect* rect) SK_OVERRIDE; - virtual void readRegion(SkRegion* region) SK_OVERRIDE; - virtual void readPath(SkPath* path) SK_OVERRIDE; + SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE; + void skipFlattenable() SK_OVERRIDE; + void readPoint(SkPoint* point) SK_OVERRIDE; + void readMatrix(SkMatrix* matrix) SK_OVERRIDE; + void readIRect(SkIRect* rect) SK_OVERRIDE; + void readRect(SkRect* rect) SK_OVERRIDE; + void readRegion(SkRegion* region) SK_OVERRIDE; + void readPath(SkPath* path) SK_OVERRIDE; // binary data and arrays - virtual bool readByteArray(void* value, size_t size) SK_OVERRIDE; - virtual bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE; - virtual bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE; - virtual bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE; - virtual bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE; + bool readByteArray(void* value, size_t size) SK_OVERRIDE; + bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE; + bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE; + bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE; + bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE; // helpers to get info about arrays and binary data - virtual uint32_t getArrayCount() SK_OVERRIDE; + uint32_t getArrayCount() SK_OVERRIDE; // TODO: Implement this (securely) when needed - virtual SkTypeface* readTypeface() SK_OVERRIDE; + SkTypeface* readTypeface() SK_OVERRIDE; - virtual bool validate(bool isValid) SK_OVERRIDE; - virtual bool isValid() const SK_OVERRIDE; + bool validate(bool isValid) SK_OVERRIDE; + bool isValid() const SK_OVERRIDE; - virtual bool validateAvailable(size_t size) SK_OVERRIDE; + bool validateAvailable(size_t size) SK_OVERRIDE; private: bool readArray(void* value, size_t size, size_t elementSize); diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index d2ba2999f6..dc0dd88402 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -828,11 +828,11 @@ public: GLProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this)); } - virtual const char* name() const SK_OVERRIDE { return "XferEffect"; } + const char* name() const SK_OVERRIDE { return "XferEffect"; } SkXfermode::Mode mode() const { return fMode; } const GrTextureAccess& backgroundAccess() const { return fBackgroundAccess; } @@ -1235,12 +1235,12 @@ private: this->setWillReadDstColor(); } } - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { const XferEffect& s = other.cast<XferEffect>(); return fMode == s.fMode; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { inout->setToUnknown(GrInvariantOutput::kWill_ReadInput); } @@ -1448,8 +1448,8 @@ public: return SkNEW_ARGS(SkClearXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() @@ -1510,8 +1510,8 @@ public: return SkNEW_ARGS(SkSrcXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() @@ -1576,7 +1576,7 @@ public: return SkNEW_ARGS(SkDstInXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() @@ -1620,7 +1620,7 @@ public: return SkNEW_ARGS(SkDstOutXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h index d7b47046d1..504e64db68 100644 --- a/src/core/SkXfermode_proccoeff.h +++ b/src/core/SkXfermode_proccoeff.h @@ -30,9 +30,9 @@ public: virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const SK_OVERRIDE; - virtual bool asMode(Mode* mode) const SK_OVERRIDE; + bool asMode(Mode* mode) const SK_OVERRIDE; - virtual bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE; + bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE; #if SK_SUPPORT_GPU virtual bool asFragmentProcessor(GrFragmentProcessor**, @@ -43,7 +43,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode) protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; Mode getMode() const { return fMode; } diff --git a/src/doc/SkDocument_PDF.cpp b/src/doc/SkDocument_PDF.cpp index 834cbc3a96..de65efe8c8 100644 --- a/src/doc/SkDocument_PDF.cpp +++ b/src/doc/SkDocument_PDF.cpp @@ -49,7 +49,7 @@ protected: return fCanvas; } - virtual void onEndPage() SK_OVERRIDE { + void onEndPage() SK_OVERRIDE { SkASSERT(fCanvas); SkASSERT(fDevice); @@ -63,7 +63,7 @@ protected: fDevice = NULL; } - virtual bool onClose(SkWStream* stream) SK_OVERRIDE { + bool onClose(SkWStream* stream) SK_OVERRIDE { SkASSERT(NULL == fCanvas); SkASSERT(NULL == fDevice); @@ -73,7 +73,7 @@ protected: return success; } - virtual void onAbort() SK_OVERRIDE { + void onAbort() SK_OVERRIDE { SkDELETE(fDoc); fDoc = NULL; } diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 791d1fee1c..ab84a0cb72 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -20,7 +20,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; @@ -71,14 +71,14 @@ public: virtual ~AlphaThresholdEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Alpha Threshold"; } + const char* name() const SK_OVERRIDE { return "Alpha Threshold"; } float innerThreshold() const { return fInnerThreshold; } float outerThreshold() const { return fOuterThreshold; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: AlphaThresholdEffect(GrTexture* texture, @@ -102,9 +102,9 @@ private: this->addTextureAccess(&fMaskTextureAccess); } - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; @@ -129,7 +129,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp index 468e9e44df..cbedcb657d 100644 --- a/src/effects/SkArithmeticMode.cpp +++ b/src/effects/SkArithmeticMode.cpp @@ -48,7 +48,7 @@ private: fEnforcePMColor = enforcePMColor; } - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { buffer.writeScalar(fK[0]); buffer.writeScalar(fK[1]); buffer.writeScalar(fK[2]); @@ -250,7 +250,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b); @@ -272,14 +272,14 @@ public: virtual ~GrArithmeticEffect(); - virtual const char* name() const SK_OVERRIDE { return "Arithmetic"; } + const char* name() const SK_OVERRIDE { return "Arithmetic"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GrGLArithmeticEffect::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GrGLArithmeticEffect, (*this)); } @@ -292,9 +292,9 @@ public: bool enforcePMColor() const { return fEnforcePMColor; } private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GrArithmeticEffect(float k1, float k2, float k3, float k4, bool enforcePMColor, GrTexture* background); diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 97ae436367..7c534d69e0 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -39,7 +39,7 @@ public: SkBlurMaskFilterImpl(SkScalar sigma, SkBlurStyle, uint32_t flags); // overrides from SkMaskFilter - virtual SkMask::Format getFormat() const SK_OVERRIDE; + SkMask::Format getFormat() const SK_OVERRIDE; virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, SkIPoint* margin) const SK_OVERRIDE; @@ -66,8 +66,8 @@ public: bool canOverwriteSrc) const SK_OVERRIDE; #endif - virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; - virtual bool asABlur(BlurRec*) const SK_OVERRIDE; + void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; + bool asABlur(BlurRec*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurMaskFilterImpl) @@ -102,7 +102,7 @@ private: } SkBlurMaskFilterImpl(SkReadBuffer&); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; SkScalar computeXformedSigma(const SkMatrix& ctm) const { bool ignoreTransform = SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTransform_BlurFlag); @@ -607,12 +607,12 @@ class GrRectBlurEffect : public GrFragmentProcessor { public: virtual ~GrRectBlurEffect(); - virtual const char* name() const SK_OVERRIDE { return "RectBlur"; } + const char* name() const SK_OVERRIDE { return "RectBlur"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; /** * Create a simple filter effect with custom bicubic coefficients. @@ -641,9 +641,9 @@ public: private: GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; static bool CreateBlurProfileTexture(GrContext *context, float sigma, GrTexture **blurProfileTexture); @@ -667,7 +667,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: typedef GrGLProgramDataManager::UniformHandle UniformHandle; @@ -876,7 +876,7 @@ public: static GrFragmentProcessor* Create(GrContext* context, float sigma, const SkRRect&); virtual ~GrRRectBlurEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "GrRRectBlur"; } + const char* name() const SK_OVERRIDE { return "GrRRectBlur"; } const SkRRect& getRRect() const { return fRRect; } float getSigma() const { return fSigma; } @@ -884,14 +884,14 @@ public: virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture); - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkRRect fRRect; float fSigma; @@ -1024,7 +1024,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fProxyRectUniform; diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index 9e2b08c91c..78f8ba3ab7 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -192,16 +192,16 @@ public: virtual ~GrColorCubeEffect(); - virtual const char* name() const SK_OVERRIDE { return "ColorCube"; } + const char* name() const SK_OVERRIDE { return "ColorCube"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; int colorCubeSize() const { return fColorCubeAccess.getTexture()->width(); } - virtual void onComputeInvariantOutput(GrInvariantOutput*) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput*) const SK_OVERRIDE; class GLProcessor : public GrGLFragmentProcessor { public: @@ -217,7 +217,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fColorCubeSizeUni; @@ -227,7 +227,7 @@ public: }; private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } GrColorCubeEffect(GrTexture* colorCube); diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index f162d2da1a..95041b5b57 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -28,7 +28,7 @@ public: SkXfermode::Mode getMode() const { return fMode; } SkPMColor getPMColor() const { return fPMColor; } - virtual bool asColorMode(SkColor* color, SkXfermode::Mode* mode) const SK_OVERRIDE { + bool asColorMode(SkColor* color, SkXfermode::Mode* mode) const SK_OVERRIDE { if (color) { *color = fColor; } @@ -38,7 +38,7 @@ public: return true; } - virtual uint32_t getFlags() const SK_OVERRIDE { + uint32_t getFlags() const SK_OVERRIDE { return fProc16 ? (kAlphaUnchanged_Flag | kHasFilter16_Flag) : 0; } @@ -65,7 +65,7 @@ public: } #ifndef SK_IGNORE_TO_STRING - virtual void toString(SkString* str) const SK_OVERRIDE { + void toString(SkString* str) const SK_OVERRIDE { str->append("SkModeColorFilter: color: 0x"); str->appendHex(fColor); str->append(" mode: "); @@ -74,12 +74,12 @@ public: #endif #if SK_SUPPORT_GPU - virtual GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; + GrFragmentProcessor* asFragmentProcessor(GrContext*) const SK_OVERRIDE; #endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter) protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { buffer.writeColor(fColor); buffer.writeUInt(fMode); } @@ -199,11 +199,11 @@ public: GLProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this)); } - virtual const char* name() const SK_OVERRIDE { return "ModeColorFilterEffect"; } + const char* name() const SK_OVERRIDE { return "ModeColorFilterEffect"; } SkXfermode::Mode mode() const { return fMode; } GrColor color() const { return fColor; } @@ -271,12 +271,12 @@ private: this->initClassID<ModeColorFilterEffect>(); } - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { const ModeColorFilterEffect& s = other.cast<ModeColorFilterEffect>(); return fMode == s.fMode && fColor == s.fColor; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkXfermode::Mode fMode; GrColor fColor; @@ -424,7 +424,7 @@ class Src_SkModeColorFilter : public SkModeColorFilter { public: Src_SkModeColorFilter(SkColor color) : INHERITED(color, SkXfermode::kSrc_Mode) {} - virtual uint32_t getFlags() const SK_OVERRIDE { + uint32_t getFlags() const SK_OVERRIDE { if (SkGetPackedA32(this->getPMColor()) == 0xFF) { return kAlphaUnchanged_Flag | kHasFilter16_Flag; } else { @@ -454,7 +454,7 @@ public: fColor32Proc = SkBlitRow::ColorProcFactory(); } - virtual uint32_t getFlags() const SK_OVERRIDE { + uint32_t getFlags() const SK_OVERRIDE { if (SkGetPackedA32(this->getPMColor()) == 0xFF) { return kAlphaUnchanged_Flag | kHasFilter16_Flag; } else { diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 2fa9e5d4ed..c9cb18635b 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -334,14 +334,14 @@ public: return SkNEW_ARGS(ColorMatrixEffect, (matrix)); } - virtual const char* name() const SK_OVERRIDE { return "Color Matrix"; } + const char* name() const SK_OVERRIDE { return "Color Matrix"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GLProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -416,12 +416,12 @@ private: this->initClassID<ColorMatrixEffect>(); } - virtual bool onIsEqual(const GrFragmentProcessor& s) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& s) const SK_OVERRIDE { const ColorMatrixEffect& cme = s.cast<ColorMatrixEffect>(); return cme.fMatrix == fMatrix; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // We only bother to check whether the alpha channel will be constant. If SkColorMatrix had // type flags it might be worth checking the other components. diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index d18d3c3b6a..263ac8c69c 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -314,7 +314,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: SkDisplacementMapEffect::ChannelSelectorType fXChannelSelector; @@ -347,7 +347,7 @@ public: GrGLDisplacementMapEffect::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GrGLDisplacementMapEffect, (*this)); } @@ -357,12 +357,12 @@ public: { return fYChannelSelector; } const SkVector& scale() const { return fScale; } - virtual const char* name() const SK_OVERRIDE { return "DisplacementMap"; } + const char* name() const SK_OVERRIDE { return "DisplacementMap"; } private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GrDisplacementMapEffect(SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index b1271d8493..2454dc1b36 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -290,7 +290,7 @@ protected: SkDiffuseLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar kd, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; #if SK_SUPPORT_GPU @@ -320,7 +320,7 @@ protected: SkSpecularLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar ks, SkScalar shininess, SkImageFilter* input, const CropRect*, uint32_t uniqueID); - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; #if SK_SUPPORT_GPU @@ -347,9 +347,9 @@ public: const SkMatrix& filterMatrix() const { return fFilterMatrix; } protected: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // lighting shaders are complicated. We just throw up our hands. inout->mulByUnknownFourComponents(); } @@ -375,16 +375,16 @@ public: kd)); } - virtual const char* name() const SK_OVERRIDE { return "DiffuseLighting"; } + const char* name() const SK_OVERRIDE { return "DiffuseLighting"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; SkScalar kd() const { return fKD; } private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; GrDiffuseLightingEffect(GrTexture* texture, const SkLight* light, @@ -413,17 +413,17 @@ public: shininess)); } - virtual const char* name() const SK_OVERRIDE { return "SpecularLighting"; } + const char* name() const SK_OVERRIDE { return "SpecularLighting"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; SkScalar ks() const { return fKS; } SkScalar shininess() const { return fShininess; } private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; GrSpecularLightingEffect(GrTexture* texture, const SkLight* light, @@ -486,7 +486,7 @@ public: virtual ~GrGLDistantLight() {} virtual void setData(const GrGLProgramDataManager&, const SkLight* light) const SK_OVERRIDE; - virtual void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE; + void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE; private: typedef GrGLLight INHERITED; @@ -500,7 +500,7 @@ public: virtual ~GrGLPointLight() {} virtual void setData(const GrGLProgramDataManager&, const SkLight* light) const SK_OVERRIDE; - virtual void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE; + void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE; private: typedef GrGLLight INHERITED; @@ -514,8 +514,8 @@ public: virtual ~GrGLSpotLight() {} virtual void setData(const GrGLProgramDataManager&, const SkLight* light) const SK_OVERRIDE; - virtual void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE; - virtual void emitLightColor(GrGLFPBuilder*, const char *surfaceToLight) SK_OVERRIDE; + void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE; + void emitLightColor(GrGLFPBuilder*, const char *surfaceToLight) SK_OVERRIDE; private: typedef GrGLLight INHERITED; @@ -592,9 +592,9 @@ public: return fDirection; }; SkPoint3 lightColor(const SkPoint3&) const { return color(); } - virtual LightType type() const SK_OVERRIDE { return kDistant_LightType; } + LightType type() const SK_OVERRIDE { return kDistant_LightType; } const SkPoint3& direction() const { return fDirection; } - virtual GrGLLight* createGLLight() const SK_OVERRIDE { + GrGLLight* createGLLight() const SK_OVERRIDE { #if SK_SUPPORT_GPU return SkNEW(GrGLDistantLight); #else @@ -602,9 +602,9 @@ public: return NULL; #endif } - virtual bool requiresFragmentPosition() const SK_OVERRIDE { return false; } + bool requiresFragmentPosition() const SK_OVERRIDE { return false; } - virtual bool isEqual(const SkLight& other) const SK_OVERRIDE { + bool isEqual(const SkLight& other) const SK_OVERRIDE { if (other.type() != kDistant_LightType) { return false; } @@ -622,10 +622,10 @@ protected: SkDistantLight(const SkPoint3& direction, const SkPoint3& color) : INHERITED(color), fDirection(direction) { } - virtual SkLight* transform(const SkMatrix& matrix) const SK_OVERRIDE { + SkLight* transform(const SkMatrix& matrix) const SK_OVERRIDE { return new SkDistantLight(direction(), color()); } - virtual void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE { + void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE { writePoint3(fDirection, buffer); } @@ -649,9 +649,9 @@ public: return direction; }; SkPoint3 lightColor(const SkPoint3&) const { return color(); } - virtual LightType type() const SK_OVERRIDE { return kPoint_LightType; } + LightType type() const SK_OVERRIDE { return kPoint_LightType; } const SkPoint3& location() const { return fLocation; } - virtual GrGLLight* createGLLight() const SK_OVERRIDE { + GrGLLight* createGLLight() const SK_OVERRIDE { #if SK_SUPPORT_GPU return SkNEW(GrGLPointLight); #else @@ -659,8 +659,8 @@ public: return NULL; #endif } - virtual bool requiresFragmentPosition() const SK_OVERRIDE { return true; } - virtual bool isEqual(const SkLight& other) const SK_OVERRIDE { + bool requiresFragmentPosition() const SK_OVERRIDE { return true; } + bool isEqual(const SkLight& other) const SK_OVERRIDE { if (other.type() != kPoint_LightType) { return false; } @@ -668,7 +668,7 @@ public: return INHERITED::isEqual(other) && fLocation == o.fLocation; } - virtual SkLight* transform(const SkMatrix& matrix) const SK_OVERRIDE { + SkLight* transform(const SkMatrix& matrix) const SK_OVERRIDE { SkPoint location2 = SkPoint::Make(fLocation.fX, fLocation.fY); matrix.mapPoints(&location2, 1); // Use X scale and Y scale on Z and average the result @@ -685,7 +685,7 @@ public: protected: SkPointLight(const SkPoint3& location, const SkPoint3& color) : INHERITED(color), fLocation(location) {} - virtual void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE { + void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE { writePoint3(fLocation, buffer); } @@ -712,7 +712,7 @@ public: fConeScale = SkScalarInvert(antiAliasThreshold); } - virtual SkLight* transform(const SkMatrix& matrix) const SK_OVERRIDE { + SkLight* transform(const SkMatrix& matrix) const SK_OVERRIDE { SkPoint location2 = SkPoint::Make(fLocation.fX, fLocation.fY); matrix.mapPoints(&location2, 1); // Use X scale and Y scale on Z and average the result @@ -748,7 +748,7 @@ public: } return color() * scale; } - virtual GrGLLight* createGLLight() const SK_OVERRIDE { + GrGLLight* createGLLight() const SK_OVERRIDE { #if SK_SUPPORT_GPU return SkNEW(GrGLSpotLight); #else @@ -756,8 +756,8 @@ public: return NULL; #endif } - virtual bool requiresFragmentPosition() const SK_OVERRIDE { return true; } - virtual LightType type() const SK_OVERRIDE { return kSpot_LightType; } + bool requiresFragmentPosition() const SK_OVERRIDE { return true; } + LightType type() const SK_OVERRIDE { return kSpot_LightType; } const SkPoint3& location() const { return fLocation; } const SkPoint3& target() const { return fTarget; } SkScalar specularExponent() const { return fSpecularExponent; } @@ -791,7 +791,7 @@ protected: fS(s) { } - virtual void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE { + void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE { writePoint3(fLocation, buffer); writePoint3(fTarget, buffer); buffer.writeScalar(fSpecularExponent); @@ -801,7 +801,7 @@ protected: writePoint3(fS, buffer); } - virtual bool isEqual(const SkLight& other) const SK_OVERRIDE { + bool isEqual(const SkLight& other) const SK_OVERRIDE { if (other.type() != kSpot_LightType) { return false; } @@ -1225,7 +1225,7 @@ public: /** * Subclasses of GrGLLightingEffect must call INHERITED::setData(); */ - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; protected: virtual void emitLightFunc(GrGLFPBuilder*, SkString* funcName) = 0; @@ -1243,8 +1243,8 @@ private: class GrGLDiffuseLightingEffect : public GrGLLightingEffect { public: GrGLDiffuseLightingEffect(const GrProcessor&); - virtual void emitLightFunc(GrGLFPBuilder*, SkString* funcName) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void emitLightFunc(GrGLFPBuilder*, SkString* funcName) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: typedef GrGLLightingEffect INHERITED; @@ -1257,8 +1257,8 @@ private: class GrGLSpecularLightingEffect : public GrGLLightingEffect { public: GrGLSpecularLightingEffect(const GrProcessor&); - virtual void emitLightFunc(GrGLFPBuilder*, SkString* funcName) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void emitLightFunc(GrGLFPBuilder*, SkString* funcName) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: typedef GrGLLightingEffect INHERITED; diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index 47cc8f135f..20e0659dfe 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -63,14 +63,14 @@ public: return SkRef(gLumaEffect); } - virtual const char* name() const SK_OVERRIDE { return "Luminance-to-Alpha"; } + const char* name() const SK_OVERRIDE { return "Luminance-to-Alpha"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GLProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -110,9 +110,9 @@ private: this->initClassID<LumaColorFilterEffect>(); } - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // The output is always black. The alpha value for the color passed in is arbitrary. inout->setToOther(kRGB_GrColorComponentFlags, GrColorPackRGBA(0, 0, 0, 0), GrInvariantOutput::kWill_ReadInput); diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index e236da53ff..4b34755a85 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -42,11 +42,11 @@ public: virtual ~GrMagnifierEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Magnifier"; } + const char* name() const SK_OVERRIDE { return "Magnifier"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; float x_offset() const { return fXOffset; } float y_offset() const { return fYOffset; } @@ -73,9 +73,9 @@ private: this->initClassID<GrMagnifierEffect>(); } - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; @@ -103,7 +103,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: UniformHandle fOffsetVar; diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index d18dc394eb..e895cacf13 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -307,20 +307,20 @@ public: MorphologyType type() const { return fType; } - virtual const char* name() const SK_OVERRIDE { return "Morphology"; } + const char* name() const SK_OVERRIDE { return "Morphology"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; protected: MorphologyType fType; private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GrMorphologyEffect(GrTexture*, Direction, int radius, MorphologyType); @@ -344,7 +344,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: int width() const { return GrMorphologyEffect::WidthFromRadius(fRadius); } diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 37c96dfd09..b721296afe 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -498,7 +498,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b); @@ -532,14 +532,14 @@ public: SkDELETE(fPaintingData); } - virtual const char* name() const SK_OVERRIDE { return "PerlinNoise"; } + const char* name() const SK_OVERRIDE { return "PerlinNoise"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GrGLPerlinNoise::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GrGLPerlinNoise, (*this)); } @@ -553,7 +553,7 @@ public: uint8_t alpha() const { return fAlpha; } private: - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const GrPerlinNoiseEffect& s = sBase.cast<GrPerlinNoiseEffect>(); return fType == s.fType && fPaintingData->fBaseFrequency == s.fPaintingData->fBaseFrequency && diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index e12b3d78ec..37fdd90223 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -40,10 +40,10 @@ public: SkDELETE(fBitmap); } - virtual bool asComponentTable(SkBitmap* table) const SK_OVERRIDE; + bool asComponentTable(SkBitmap* table) const SK_OVERRIDE; #if SK_SUPPORT_GPU - virtual GrFragmentProcessor* asFragmentProcessor(GrContext* context) const SK_OVERRIDE; + GrFragmentProcessor* asFragmentProcessor(GrContext* context) const SK_OVERRIDE; #endif virtual void filterSpan(const SkPMColor src[], int count, @@ -61,7 +61,7 @@ public: }; protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: mutable const SkBitmap* fBitmap; // lazily allocated @@ -289,19 +289,19 @@ public: virtual ~ColorTableEffect(); - virtual const char* name() const SK_OVERRIDE { return "ColorTable"; } + const char* name() const SK_OVERRIDE { return "ColorTable"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const GrTextureStripAtlas* atlas() const { return fAtlas; } int atlasRow() const { return fRow; } private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row, unsigned flags); @@ -329,7 +329,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b) {} diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 125c7b056d..99ad70c54a 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -166,7 +166,7 @@ public: public: GradientShaderBaseContext(const SkGradientShaderBase& shader, const ContextRec&); - virtual uint32_t getFlags() const SK_OVERRIDE { return fFlags; } + uint32_t getFlags() const SK_OVERRIDE { return fFlags; } protected: SkMatrix fDstToIndex; @@ -180,7 +180,7 @@ public: typedef SkShader::Context INHERITED; }; - virtual bool isOpaque() const SK_OVERRIDE; + bool isOpaque() const SK_OVERRIDE; void getGradientTableBitmap(SkBitmap*) const; @@ -220,7 +220,7 @@ public: protected: SkGradientShaderBase(SkReadBuffer& ); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() const SkMatrix fPtsToUnit; @@ -237,7 +237,7 @@ protected: void commonAsAGradient(GradientInfo*, bool flipGrad = false) const; - virtual bool onAsLuminanceColor(SkColor*) const SK_OVERRIDE; + bool onAsLuminanceColor(SkColor*) const SK_OVERRIDE; /* * Takes in pointers to gradient color and Rec info as colorSrc and recSrc respectively. @@ -368,9 +368,9 @@ protected: SkScalar** stops, SkShader::TileMode* tm); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; const GrCoordTransform& getCoordTransform() const { return fCoordTransform; } @@ -399,7 +399,7 @@ public: GrGLGradientEffect(); virtual ~GrGLGradientEffect(); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; protected: /** diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 885a1b56c8..b34c7964ee 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -495,14 +495,14 @@ public: virtual ~GrLinearGradient() { } - virtual const char* name() const SK_OVERRIDE { return "Linear Gradient"; } + const char* name() const SK_OVERRIDE { return "Linear Gradient"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GrGLLinearGradient::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GrGLLinearGradient, (*this)); } diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h index 1a7688d39d..e63a1b8a2e 100644 --- a/src/effects/gradients/SkLinearGradient.h +++ b/src/effects/gradients/SkLinearGradient.h @@ -14,22 +14,22 @@ class SkLinearGradient : public SkGradientShaderBase { public: SkLinearGradient(const SkPoint pts[2], const Descriptor&); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class LinearGradientContext : public SkGradientShaderBase::GradientShaderBaseContext { public: LinearGradientContext(const SkLinearGradient&, const ContextRec&); ~LinearGradientContext() {} - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; private: typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED; }; - virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; + BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; + GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, GrColor*, GrFragmentProcessor**) const SK_OVERRIDE; @@ -39,8 +39,8 @@ public: protected: SkLinearGradient(SkReadBuffer& buffer); - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: friend class SkGradientShader; diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 4f451b7edf..5ea2e72a9d 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -498,14 +498,14 @@ public: virtual ~GrRadialGradient() { } - virtual const char* name() const SK_OVERRIDE { return "Radial Gradient"; } + const char* name() const SK_OVERRIDE { return "Radial Gradient"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GrGLRadialGradient::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GrGLRadialGradient, (*this)); } diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h index 56d4d7e250..a690bb5321 100644 --- a/src/effects/gradients/SkRadialGradient.h +++ b/src/effects/gradients/SkRadialGradient.h @@ -15,14 +15,14 @@ class SkRadialGradient : public SkGradientShaderBase { public: SkRadialGradient(const SkPoint& center, SkScalar radius, const Descriptor&); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class RadialGradientContext : public SkGradientShaderBase::GradientShaderBaseContext { public: RadialGradientContext(const SkRadialGradient&, const ContextRec&); - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; private: typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED; @@ -31,7 +31,7 @@ public: virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const SK_OVERRIDE; - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; + GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, GrColor*, GrFragmentProcessor**) const SK_OVERRIDE; @@ -41,8 +41,8 @@ public: protected: SkRadialGradient(SkReadBuffer& buffer); - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: friend class SkGradientShader; diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index bcb2b0dc9e..f8ee458346 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -217,14 +217,14 @@ public: } virtual ~GrSweepGradient() { } - virtual const char* name() const SK_OVERRIDE { return "Sweep Gradient"; } + const char* name() const SK_OVERRIDE { return "Sweep Gradient"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GrGLSweepGradient::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GrGLSweepGradient, (*this)); } diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h index 9408feaac8..b72a08d834 100644 --- a/src/effects/gradients/SkSweepGradient.h +++ b/src/effects/gradients/SkSweepGradient.h @@ -15,14 +15,14 @@ class SkSweepGradient : public SkGradientShaderBase { public: SkSweepGradient(SkScalar cx, SkScalar cy, const Descriptor&); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class SweepGradientContext : public SkGradientShaderBase::GradientShaderBaseContext { public: SweepGradientContext(const SkSweepGradient& shader, const ContextRec&); - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; private: typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED; @@ -32,7 +32,7 @@ public: SkMatrix* matrix, TileMode* xy) const SK_OVERRIDE; - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; + GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, GrColor*, @@ -42,8 +42,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient) protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: const SkPoint fCenter; diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h index 217400eb32..ff12236aae 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.h +++ b/src/effects/gradients/SkTwoPointConicalGradient.h @@ -45,14 +45,14 @@ public: bool flippedGrad, const Descriptor&); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class TwoPointConicalGradientContext : public SkGradientShaderBase::GradientShaderBaseContext { public: TwoPointConicalGradientContext(const SkTwoPointConicalGradient&, const ContextRec&); ~TwoPointConicalGradientContext() {} - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; private: typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED; @@ -61,10 +61,10 @@ public: virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const SK_OVERRIDE; - virtual SkShader::GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; + SkShader::GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*, GrColor*, GrFragmentProcessor**) const SK_OVERRIDE; - virtual bool isOpaque() const SK_OVERRIDE; + bool isOpaque() const SK_OVERRIDE; SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); } SkScalar getStartRadius() const { return fRadius1; } @@ -79,8 +79,8 @@ public: protected: SkTwoPointConicalGradient(SkReadBuffer& buffer); - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: SkPoint fCenter1; diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index 8783de7bcf..c9f2d2f50a 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -66,13 +66,13 @@ public: virtual ~Edge2PtConicalEffect() {} - virtual const char* name() const SK_OVERRIDE { + const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Edge Touching"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; // The radial gradient parameters can collapse to a linear (instead of quadratic) equation. SkScalar center() const { return fCenterX1; } @@ -80,7 +80,7 @@ public: SkScalar radius() const { return fRadius0; } private: - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const Edge2PtConicalEffect& s = sBase.cast<Edge2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && this->fCenterX1 == s.fCenterX1 && @@ -147,7 +147,7 @@ public: const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b); @@ -388,19 +388,19 @@ public: virtual ~FocalOutside2PtConicalEffect() { } - virtual const char* name() const SK_OVERRIDE { + const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Focal Outside"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; bool isFlipped() const { return fIsFlipped; } SkScalar focal() const { return fFocalX; } private: - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const FocalOutside2PtConicalEffect& s = sBase.cast<FocalOutside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && this->fFocalX == s.fFocalX && @@ -435,7 +435,7 @@ public: const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b); @@ -610,20 +610,20 @@ public: virtual ~FocalInside2PtConicalEffect() {} - virtual const char* name() const SK_OVERRIDE { + const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Focal Inside"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; SkScalar focal() const { return fFocalX; } typedef GLFocalInside2PtConicalEffect GLProcessor; private: - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const FocalInside2PtConicalEffect& s = sBase.cast<FocalInside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && this->fFocalX == s.fFocalX); @@ -656,7 +656,7 @@ public: const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b); @@ -857,12 +857,12 @@ public: virtual ~CircleInside2PtConicalEffect() {} - virtual const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Inside"; } + const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Inside"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; SkScalar centerX() const { return fInfo.fCenterEnd.fX; } SkScalar centerY() const { return fInfo.fCenterEnd.fY; } @@ -871,7 +871,7 @@ public: SkScalar C() const { return fInfo.fC; } private: - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const CircleInside2PtConicalEffect& s = sBase.cast<CircleInside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && this->fInfo.fCenterEnd == s.fInfo.fCenterEnd && @@ -907,7 +907,7 @@ public: const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b); @@ -1081,11 +1081,11 @@ public: virtual ~CircleOutside2PtConicalEffect() {} - virtual const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Outside"; } + const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Outside"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; SkScalar centerX() const { return fInfo.fCenterEnd.fX; } SkScalar centerY() const { return fInfo.fCenterEnd.fY; } @@ -1096,7 +1096,7 @@ public: bool isFlipped() const { return fIsFlipped; } private: - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const CircleOutside2PtConicalEffect& s = sBase.cast<CircleOutside2PtConicalEffect>(); return (INHERITED::onIsEqual(sBase) && this->fInfo.fCenterEnd == s.fInfo.fCenterEnd && @@ -1144,7 +1144,7 @@ public: const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b); diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 1a345bf8d1..e0ea35e860 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -406,7 +406,7 @@ public: const char* inputColor, const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b); @@ -447,14 +447,14 @@ public: virtual ~GrRadial2Gradient() { } - virtual const char* name() const SK_OVERRIDE { return "Two-Point Radial Gradient"; } + const char* name() const SK_OVERRIDE { return "Two-Point Radial Gradient"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GrGLRadial2Gradient::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GrGLRadial2Gradient, (*this)); } @@ -465,7 +465,7 @@ public: bool isPosRoot() const { return SkToBool(fPosRoot); } private: - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const GrRadial2Gradient& s = sBase.cast<GrRadial2Gradient>(); return (INHERITED::onIsEqual(sBase) && this->fCenterX1 == s.fCenterX1 && diff --git a/src/effects/gradients/SkTwoPointRadialGradient.h b/src/effects/gradients/SkTwoPointRadialGradient.h index 43f9f57a98..ece3858ee2 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.h +++ b/src/effects/gradients/SkTwoPointRadialGradient.h @@ -20,18 +20,18 @@ public: virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy) const SK_OVERRIDE; - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; + GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual bool asFragmentProcessor(GrContext* context, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, GrColor*, GrFragmentProcessor**) const SK_OVERRIDE; - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class TwoPointRadialGradientContext : public SkGradientShaderBase::GradientShaderBaseContext { public: TwoPointRadialGradientContext(const SkTwoPointRadialGradient&, const ContextRec&); - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; private: typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED; @@ -46,8 +46,8 @@ public: protected: SkTwoPointRadialGradient(SkReadBuffer& buffer); - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: const SkPoint fCenter1; diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp index bc667e7dbe..a3989fca75 100644 --- a/src/fonts/SkFontMgr_fontconfig.cpp +++ b/src/fonts/SkFontMgr_fontconfig.cpp @@ -142,10 +142,10 @@ public: SkFontStyleSet_FC(FcPattern** matches, int count); virtual ~SkFontStyleSet_FC(); - virtual int count() SK_OVERRIDE { return fRecCount; } - virtual void getStyle(int index, SkFontStyle*, SkString* style) SK_OVERRIDE; - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE; - virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE; + int count() SK_OVERRIDE { return fRecCount; } + void getStyle(int index, SkFontStyle*, SkString* style) SK_OVERRIDE; + SkTypeface* createTypeface(int index) SK_OVERRIDE; + SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE; private: struct Rec { @@ -226,19 +226,19 @@ public: } protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return fFamilyNames->count(); } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { familyName->set(fFamilyNames->atStr(index)); } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { return this->onMatchFamily(fFamilyNames->atStr(index)); } - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { FCLocker lock; FcPattern* pattern = FcPatternCreate(); @@ -293,9 +293,9 @@ protected: virtual SkTypeface* onMatchFaceStyle(const SkTypeface*, const SkFontStyle&) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) const SK_OVERRIDE { return NULL; } + SkTypeface* onCreateFromData(SkData*, int ttcIndex) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { const size_t length = stream->getLength(); if (!length) { return NULL; @@ -315,7 +315,7 @@ protected: return face; } - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL; } diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp index 39270b4a4b..c438623c61 100644 --- a/src/fonts/SkFontMgr_indirect.cpp +++ b/src/fonts/SkFontMgr_indirect.cpp @@ -25,9 +25,9 @@ public: : fOwner(SkRef(owner)), fFamilyIndex(familyIndex), fData(data) { } - virtual int count() SK_OVERRIDE { return fData->count(); } + int count() SK_OVERRIDE { return fData->count(); } - virtual void getStyle(int index, SkFontStyle* fs, SkString* style) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* fs, SkString* style) SK_OVERRIDE { if (fs) { *fs = fData->at(index).fFontStyle; } @@ -37,11 +37,11 @@ public: } } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { return fOwner->createTypefaceFromFontId(fData->at(index)); } - virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { if (fFamilyIndex >= 0) { SkFontIdentity id = fOwner->fProxy->matchIndexStyle(fFamilyIndex, pattern); return fOwner->createTypefaceFromFontId(id); diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp index cacc27064f..7c447090e1 100644 --- a/src/fonts/SkGScalerContext.cpp +++ b/src/fonts/SkGScalerContext.cpp @@ -16,13 +16,13 @@ public: virtual ~SkGScalerContext(); protected: - virtual unsigned generateGlyphCount() SK_OVERRIDE; - virtual uint16_t generateCharToGlyph(SkUnichar) SK_OVERRIDE; - virtual void generateAdvance(SkGlyph*) SK_OVERRIDE; - virtual void generateMetrics(SkGlyph*) SK_OVERRIDE; - virtual void generateImage(const SkGlyph&) SK_OVERRIDE; - virtual void generatePath(const SkGlyph&, SkPath*) SK_OVERRIDE; - virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; + unsigned generateGlyphCount() SK_OVERRIDE; + uint16_t generateCharToGlyph(SkUnichar) SK_OVERRIDE; + void generateAdvance(SkGlyph*) SK_OVERRIDE; + void generateMetrics(SkGlyph*) SK_OVERRIDE; + void generateImage(const SkGlyph&) SK_OVERRIDE; + void generatePath(const SkGlyph&, SkPath*) SK_OVERRIDE; + void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; private: SkGTypeface* fFace; diff --git a/src/fonts/SkGScalerContext.h b/src/fonts/SkGScalerContext.h index 8ad28173c0..54af3c39d3 100644 --- a/src/fonts/SkGScalerContext.h +++ b/src/fonts/SkGScalerContext.h @@ -20,24 +20,24 @@ public: const SkPaint& paint() const { return fPaint; } protected: - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t* glyphIDs, uint32_t glyphIDsCount) const SK_OVERRIDE; - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; - virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const SK_OVERRIDE; + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; + void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const SK_OVERRIDE; virtual int onCharsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE; - virtual int onCountGlyphs() const SK_OVERRIDE; - virtual int onGetUPEM() const SK_OVERRIDE; + int onCountGlyphs() const SK_OVERRIDE; + int onGetUPEM() const SK_OVERRIDE; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp index b148375b09..b9aa6c7de6 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/src/fonts/SkTestScalerContext.cpp @@ -201,17 +201,17 @@ public: } protected: - virtual unsigned generateGlyphCount() SK_OVERRIDE { + unsigned generateGlyphCount() SK_OVERRIDE { return fFace->onCountGlyphs(); } - virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE { + uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE { uint16_t glyph; (void) fFace->onCharsToGlyphs((const void *) &uni, SkTypeface::kUTF16_Encoding, &glyph, 1); return glyph; } - virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE { + void generateAdvance(SkGlyph* glyph) SK_OVERRIDE { fFace->getAdvance(glyph); SkVector advance; @@ -221,7 +221,7 @@ protected: glyph->fAdvanceY = SkScalarToFixed(advance.fY); } - virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE { + void generateMetrics(SkGlyph* glyph) SK_OVERRIDE { fFace->getMetrics(glyph); SkVector advance; @@ -248,7 +248,7 @@ protected: glyph->fMaskFormat = SkMask::kARGB32_Format; } - virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE { + void generateImage(const SkGlyph& glyph) SK_OVERRIDE { SkPath path; fFace->getPath(glyph, &path); @@ -266,12 +266,12 @@ protected: canvas.drawPath(path, paint); } - virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE { + void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE { fFace->getPath(glyph, path); path->transform(fMatrix); } - virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE { + void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE { fFace->getFontMetrics(metrics); if (metrics) { SkScalar scale = fMatrix.getScaleY(); diff --git a/src/fonts/SkTestScalerContext.h b/src/fonts/SkTestScalerContext.h index 3e6dc97ed1..6a78e5a1b4 100644 --- a/src/fonts/SkTestScalerContext.h +++ b/src/fonts/SkTestScalerContext.h @@ -66,36 +66,36 @@ public: void getMetrics(SkGlyph* glyph); void getPath(const SkGlyph& glyph, SkPath* path); protected: - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const SK_OVERRIDE; - virtual void onFilterRec(SkScalerContextRec* rec) const SK_OVERRIDE; + SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const SK_OVERRIDE; + void onFilterRec(SkScalerContextRec* rec) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo , const uint32_t* glyphIDs, uint32_t glyphIDsCount) const SK_OVERRIDE; - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { SkASSERT(0); // don't expect to get here return NULL; } - virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const SK_OVERRIDE; + void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const SK_OVERRIDE; virtual int onCharsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE; - virtual int onCountGlyphs() const SK_OVERRIDE { + int onCountGlyphs() const SK_OVERRIDE { return (int) fTestFont->fCharCodesCount; } - virtual int onGetUPEM() const SK_OVERRIDE { + int onGetUPEM() const SK_OVERRIDE { SkASSERT(0); // don't expect to get here return 1; } - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; } diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp index fcf38ef7e7..784f685f64 100644 --- a/src/gpu/GrAAConvexPathRenderer.cpp +++ b/src/gpu/GrAAConvexPathRenderer.cpp @@ -524,7 +524,7 @@ public: virtual ~QuadEdgeEffect() {} - virtual const char* name() const SK_OVERRIDE { return "QuadEdge"; } + const char* name() const SK_OVERRIDE { return "QuadEdge"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inQuadEdge() const { return fInQuadEdge; } @@ -535,7 +535,7 @@ public: const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const QuadEdgeEffect& qe = args.fGP.cast<QuadEdgeEffect>(); GrGLGPBuilder* pb = args.fPB; GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); @@ -622,7 +622,7 @@ public: GLProcessor::GenKey(*this, bt, caps, b); } - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this, bt)); } @@ -651,11 +651,11 @@ private: fInQuadEdge = &this->addVertexAttrib(GrAttribute("inQuadEdge", kVec4f_GrVertexAttribType)); } - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { return true; } - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h index f1e6b03212..bffacd52d0 100644 --- a/src/gpu/GrBitmapTextContext.h +++ b/src/gpu/GrBitmapTextContext.h @@ -39,7 +39,7 @@ private: GrBitmapTextContext(GrContext*, const SkDeviceProperties&); - virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE; + bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE; virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index b64c456b5f..49c663dcec 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -35,7 +35,7 @@ public: coverage)); } - virtual const char* name() const SK_OVERRIDE { return "DefaultGeometryProcessor"; } + const char* name() const SK_OVERRIDE { return "DefaultGeometryProcessor"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inColor() const { return fInColor; } @@ -83,7 +83,7 @@ public: GLProcessor(const GrGeometryProcessor& gp, const GrBatchTracker&) : fColor(GrColor_ILLEGAL), fCoverage(0xff) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const DefaultGeoProc& gp = args.fGP.cast<DefaultGeoProc>(); GrGLGPBuilder* pb = args.fPB; GrGLVertexBuilder* vs = pb->getVertexShaderBuilder(); @@ -174,7 +174,7 @@ public: GLProcessor::GenKey(*this, bt, caps, b); } - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this, bt)); } @@ -212,12 +212,12 @@ private: } } - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { const DefaultGeoProc& gp = other.cast<DefaultGeoProc>(); return gp.fFlags == this->fFlags; } - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { if (fInCoverage) { out->setUnknownSingleComponent(); } else { diff --git a/src/gpu/GrDistanceFieldTextContext.h b/src/gpu/GrDistanceFieldTextContext.h index 8f73b06500..c2d0b6d1ce 100644 --- a/src/gpu/GrDistanceFieldTextContext.h +++ b/src/gpu/GrDistanceFieldTextContext.h @@ -50,7 +50,7 @@ private: GrDistanceFieldTextContext(GrContext*, const SkDeviceProperties&, bool enable); - virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE; + bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE; virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h index b1d1492764..0e211ba85d 100644 --- a/src/gpu/GrDrawTarget.h +++ b/src/gpu/GrDrawTarget.h @@ -837,7 +837,7 @@ public: * Release any resources that are cached but not currently in use. This * is intended to give an application some recourse when resources are low. */ - virtual void purgeResources() SK_OVERRIDE { + void purgeResources() SK_OVERRIDE { // The clip mask manager can rebuild all its clip masks so just // get rid of them all. fClipMaskManager.purgeResources(); diff --git a/src/gpu/GrGeometryProcessor.h b/src/gpu/GrGeometryProcessor.h index d88f3e632a..ad75d23768 100644 --- a/src/gpu/GrGeometryProcessor.h +++ b/src/gpu/GrGeometryProcessor.h @@ -375,7 +375,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; private: GrPathProcessor(GrColor color, const SkMatrix& viewMatrix, const SkMatrix& localMatrix); diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h index 5a616e158e..d415e49517 100644 --- a/src/gpu/GrInOrderDrawBuffer.h +++ b/src/gpu/GrInOrderDrawBuffer.h @@ -256,7 +256,7 @@ private: // Records any trace markers for a command after adding it to the buffer. void recordTraceMarkersIfNecessary(); - virtual bool isIssued(uint32_t drawID) SK_OVERRIDE { return drawID != fDrawID; } + bool isIssued(uint32_t drawID) SK_OVERRIDE { return drawID != fDrawID; } // TODO: Use a single allocator for commands and records enum { diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index b43c48561f..7f93bbe339 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -73,7 +73,7 @@ public: const GrAttribute* inCircleEdge() const { return fInCircleEdge; } virtual ~CircleEdgeEffect() {} - virtual const char* name() const SK_OVERRIDE { return "CircleEdge"; } + const char* name() const SK_OVERRIDE { return "CircleEdge"; } inline bool isStroked() const { return fStroke; } @@ -83,7 +83,7 @@ public: const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const CircleEdgeEffect& ce = args.fGP.cast<CircleEdgeEffect>(); GrGLGPBuilder* pb = args.fPB; const BatchTracker& local = args.fBT.cast<BatchTracker>(); @@ -157,7 +157,7 @@ public: GLProcessor::GenKey(*this, bt, caps, b); } - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this, bt)); } @@ -188,12 +188,12 @@ private: fStroke = stroke; } - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { const CircleEdgeEffect& cee = other.cast<CircleEdgeEffect>(); return cee.fStroke == fStroke; } - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } @@ -241,7 +241,7 @@ public: virtual ~EllipseEdgeEffect() {} - virtual const char* name() const SK_OVERRIDE { return "EllipseEdge"; } + const char* name() const SK_OVERRIDE { return "EllipseEdge"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inEllipseOffset() const { return fInEllipseOffset; } @@ -255,7 +255,7 @@ public: const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const EllipseEdgeEffect& ee = args.fGP.cast<EllipseEdgeEffect>(); GrGLGPBuilder* pb = args.fPB; const BatchTracker& local = args.fBT.cast<BatchTracker>(); @@ -351,7 +351,7 @@ public: GLProcessor::GenKey(*this, bt, caps, b); } - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this, bt)); } @@ -384,12 +384,12 @@ private: fStroke = stroke; } - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { const EllipseEdgeEffect& eee = other.cast<EllipseEdgeEffect>(); return eee.fStroke == fStroke; } - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } @@ -441,7 +441,7 @@ public: virtual ~DIEllipseEdgeEffect() {} - virtual const char* name() const SK_OVERRIDE { return "DIEllipseEdge"; } + const char* name() const SK_OVERRIDE { return "DIEllipseEdge"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inEllipseOffsets0() const { return fInEllipseOffsets0; } @@ -455,7 +455,7 @@ public: const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const DIEllipseEdgeEffect& ee = args.fGP.cast<DIEllipseEdgeEffect>(); GrGLGPBuilder* pb = args.fPB; const BatchTracker& local = args.fBT.cast<BatchTracker>(); @@ -566,7 +566,7 @@ public: GLProcessor::GenKey(*this, bt, caps, b); } - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this, bt)); } @@ -599,12 +599,12 @@ private: fMode = mode; } - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE { const DIEllipseEdgeEffect& eee = other.cast<DIEllipseEdgeEffect>(); return eee.fMode == fMode; } - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp index 1b0ce19e55..c7f2d9df54 100644 --- a/src/gpu/GrPathRendering.cpp +++ b/src/gpu/GrPathRendering.cpp @@ -24,11 +24,11 @@ public: SkDescriptor::Free(fDesc); } - virtual int getNumPaths() SK_OVERRIDE { + int getNumPaths() SK_OVERRIDE { return fScalerContext->getGlyphCount(); } - virtual void generatePath(int glyphID, SkPath* out) SK_OVERRIDE { + void generatePath(int glyphID, SkPath* out) SK_OVERRIDE { SkGlyph skGlyph; skGlyph.init(SkGlyph::MakeID(glyphID)); fScalerContext->getMetrics(&skGlyph); @@ -37,7 +37,7 @@ public: out->transform(fFlipMatrix); // Load glyphs with the inverted y-direction. } - virtual bool isEqualTo(const SkDescriptor& desc) const SK_OVERRIDE { + bool isEqualTo(const SkDescriptor& desc) const SK_OVERRIDE { return fDesc->equals(desc); } diff --git a/src/gpu/GrRectanizer_pow2.h b/src/gpu/GrRectanizer_pow2.h index 7bf2b868c0..59ef86406e 100644 --- a/src/gpu/GrRectanizer_pow2.h +++ b/src/gpu/GrRectanizer_pow2.h @@ -24,15 +24,15 @@ public: virtual ~GrRectanizerPow2() { } - virtual void reset() SK_OVERRIDE { + void reset() SK_OVERRIDE { fNextStripY = 0; fAreaSoFar = 0; sk_bzero(fRows, sizeof(fRows)); } - virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE; + bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE; - virtual float percentFull() const SK_OVERRIDE { + float percentFull() const SK_OVERRIDE { return fAreaSoFar / ((float)this->width() * this->height()); } diff --git a/src/gpu/GrRectanizer_skyline.h b/src/gpu/GrRectanizer_skyline.h index 21043c0b6d..c9f9255580 100644 --- a/src/gpu/GrRectanizer_skyline.h +++ b/src/gpu/GrRectanizer_skyline.h @@ -21,7 +21,7 @@ public: virtual ~GrRectanizerSkyline() { } - virtual void reset() SK_OVERRIDE{ + void reset() SK_OVERRIDE{ fAreaSoFar = 0; fSkyline.reset(); SkylineSegment* seg = fSkyline.append(1); @@ -30,9 +30,9 @@ public: seg->fWidth = this->width(); } - virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE; + bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE; - virtual float percentFull() const SK_OVERRIDE { + float percentFull() const SK_OVERRIDE { return fAreaSoFar / ((float)this->width() * this->height()); } diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h index 89c94ebad6..c7b06cc104 100644 --- a/src/gpu/GrStencilAndCoverTextContext.h +++ b/src/gpu/GrStencilAndCoverTextContext.h @@ -69,7 +69,7 @@ private: GrStencilAndCoverTextContext(GrContext*, const SkDeviceProperties&); - virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE; + bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE; virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index 773110023c..56dad1b475 100644 --- a/src/gpu/SkGpuDevice.h +++ b/src/gpu/SkGpuDevice.h @@ -68,13 +68,13 @@ public: // set all pixels to 0 void clearAll(); - virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE; + GrRenderTarget* accessRenderTarget() SK_OVERRIDE; - virtual SkImageInfo imageInfo() const SK_OVERRIDE { + SkImageInfo imageInfo() const SK_OVERRIDE { return fRenderTarget ? fRenderTarget->surfacePriv().info() : SkImageInfo::MakeUnknown(); } - virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; + void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], const SkPaint& paint) SK_OVERRIDE; virtual void drawRect(const SkDraw&, const SkRect& r, @@ -112,14 +112,14 @@ public: virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) SK_OVERRIDE; - virtual void flush() SK_OVERRIDE; + void flush() SK_OVERRIDE; - virtual void onAttachToCanvas(SkCanvas* canvas) SK_OVERRIDE; - virtual void onDetachFromCanvas() SK_OVERRIDE; + void onAttachToCanvas(SkCanvas* canvas) SK_OVERRIDE; + void onDetachFromCanvas() SK_OVERRIDE; - virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE; + const SkBitmap& onAccessBitmap() SK_OVERRIDE; - virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE; + bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE; virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&, SkBitmap*, SkIPoint*) SK_OVERRIDE; @@ -129,8 +129,8 @@ public: SkBitmap* result, SkIPoint* offset); protected: - virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) SK_OVERRIDE; - virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE; + bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) SK_OVERRIDE; + bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE; bool onShouldDisableLCD(const SkPaint&) const SK_OVERRIDE; /** PRIVATE / EXPERIMENTAL -- do not call */ @@ -155,13 +155,13 @@ private: SkGpuDevice(GrSurface*, const SkSurfaceProps&, unsigned flags = 0); - virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; - virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; + SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; - virtual SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE; + SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE; - virtual bool forceConservativeRasterClip() const SK_OVERRIDE { return true; } + bool forceConservativeRasterClip() const SK_OVERRIDE { return true; } // sets the render target and clip on context void prepareDraw(const SkDraw&); diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index d1fc6f0496..49d3c6bb48 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -122,7 +122,7 @@ public: private: GrResourceKey fKey; - virtual void onChange() SK_OVERRIDE { + void onChange() SK_OVERRIDE { const GrResourceInvalidatedMessage message = { fKey }; SkMessageBus<GrResourceInvalidatedMessage>::Post(message); } diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index e846b79b25..e16601dee1 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -24,7 +24,7 @@ public: GrGLConicEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -258,7 +258,7 @@ public: GrGLQuadEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -478,7 +478,7 @@ public: GrGLCubicEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h index 1bd93b64c9..f31542f4db 100644 --- a/src/gpu/effects/GrBezierEffect.h +++ b/src/gpu/effects/GrBezierEffect.h @@ -90,7 +90,7 @@ public: virtual ~GrConicEffect(); - virtual const char* name() const SK_OVERRIDE { return "Conic"; } + const char* name() const SK_OVERRIDE { return "Conic"; } inline const GrAttribute* inPosition() const { return fInPosition; } inline const GrAttribute* inConicCoeffs() const { return fInConicCoeffs; } @@ -102,7 +102,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -113,9 +113,9 @@ private: GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } @@ -174,7 +174,7 @@ public: virtual ~GrQuadEffect(); - virtual const char* name() const SK_OVERRIDE { return "Quad"; } + const char* name() const SK_OVERRIDE { return "Quad"; } inline const GrAttribute* inPosition() const { return fInPosition; } inline const GrAttribute* inHairQuadEdge() const { return fInHairQuadEdge; } @@ -186,7 +186,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -197,9 +197,9 @@ private: GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } @@ -254,7 +254,7 @@ public: virtual ~GrCubicEffect(); - virtual const char* name() const SK_OVERRIDE { return "Cubic"; } + const char* name() const SK_OVERRIDE { return "Cubic"; } inline const GrAttribute* inPosition() const { return fInPosition; } inline const GrAttribute* inCubicCoeffs() const { return fInCubicCoeffs; } @@ -266,7 +266,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -276,9 +276,9 @@ public: private: GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index 76edff0dc6..7d2dbf4a09 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -30,7 +30,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static inline void GenKey(const GrProcessor& effect, const GrGLCaps&, GrProcessorKeyBuilder* b) { diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h index 19fce03c7f..89e43c121b 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -25,11 +25,11 @@ public: const float* coefficients() const { return fCoefficients; } - virtual const char* name() const SK_OVERRIDE { return "Bicubic"; } + const char* name() const SK_OVERRIDE { return "Bicubic"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const GrTextureDomain& domain() const { return fDomain; } @@ -91,9 +91,9 @@ private: const SkMatrix &matrix, const SkShader::TileMode tileModes[2]); GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix, const SkRect& domain); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; float fCoefficients[16]; GrTextureDomain fDomain; diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 5f44d32318..1cfb64414b 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -25,7 +25,7 @@ public: GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>(); const BitmapTextBatchTracker& local = args.fBT.cast<BitmapTextBatchTracker>(); diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h index c69ffd7a1b..85e4f421e1 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -30,7 +30,7 @@ public: virtual ~GrBitmapTextGeoProc() {} - virtual const char* name() const SK_OVERRIDE { return "Texture"; } + const char* name() const SK_OVERRIDE { return "Texture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inColor() const { return fInColor; } @@ -40,7 +40,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -51,9 +51,9 @@ private: GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params, bool useColorAttrib, bool opaqueVertexColors, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; const GrAttribute* fInPosition; diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index d85e783c27..5760bb4c16 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -37,11 +37,11 @@ public: static const GrFragmentProcessor* Create(GrTexture*, bool swapRedAndBlue, PMConversion, const SkMatrix&); - virtual const char* name() const SK_OVERRIDE { return "Config Conversion"; } + const char* name() const SK_OVERRIDE { return "Config Conversion"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; bool swapsRedAndBlue() const { return fSwapRedAndBlue; } PMConversion pmConversion() const { return fPMConversion; } @@ -61,9 +61,9 @@ private: PMConversion pmConversion, const SkMatrix& matrix); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; bool fSwapRedAndBlue; PMConversion fPMConversion; diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index 14307165e3..7035094fa6 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -23,11 +23,11 @@ public: GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } - virtual const char* name() const SK_OVERRIDE { return "AARect"; } + const char* name() const SK_OVERRIDE { return "AARect"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect) @@ -36,12 +36,12 @@ private: this->setWillReadFragmentPosition(); } - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { const AARectEffect& aare = other.cast<AARectEffect>(); return fRect == aare.fRect; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { if (fRect.isEmpty()) { // An empty rect will have no coverage anywhere. inout->mulByKnownSingleComponent(0); @@ -94,7 +94,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fRectUniform; @@ -189,7 +189,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fEdgeUniform; diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/effects/GrConvexPolyEffect.h index fec7e82b0e..e0eee5d369 100644 --- a/src/gpu/effects/GrConvexPolyEffect.h +++ b/src/gpu/effects/GrConvexPolyEffect.h @@ -61,7 +61,7 @@ public: virtual ~GrConvexPolyEffect(); - virtual const char* name() const SK_OVERRIDE { return "ConvexPoly"; } + const char* name() const SK_OVERRIDE { return "ConvexPoly"; } GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } @@ -69,16 +69,16 @@ public: const SkScalar* getEdges() const { return fEdges; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]); - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GrPrimitiveEdgeType fEdgeType; int fEdgeCount; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index e3f051b0eb..ef892dcd0b 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -25,7 +25,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) SK_OVERRIDE; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index 0d1226b3aa..4ea436c227 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -57,11 +57,11 @@ public: const float* bounds() const { return fBounds; } bool useBounds() const { return fUseBounds; } - virtual const char* name() const SK_OVERRIDE { return "Convolution"; } + const char* name() const SK_OVERRIDE { return "Convolution"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; enum { // This was decided based on the min allowed value for the max texture @@ -94,9 +94,9 @@ private: bool useBounds, float bounds[2]); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // If the texture was opaque we could know that the output color if we knew the sum of the // kernel values. inout->mulByUnknownFourComponents(); diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 47b8d65a22..8b69dca9d2 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -478,7 +478,7 @@ public: virtual ~DashingCircleEffect(); - virtual const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; } + const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; } const GrAttribute* inPosition() const { return fInPosition; } @@ -496,7 +496,7 @@ public: const GrGLCaps&, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker&) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker&) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -508,9 +508,9 @@ private: DashingCircleEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info, SkScalar radius, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrPrimitiveEdgeType fEdgeType; const GrAttribute* fInPosition; @@ -530,7 +530,7 @@ class GLDashingCircleEffect : public GrGLGeometryProcessor { public: GLDashingCircleEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -767,7 +767,7 @@ public: virtual ~DashingLineEffect(); - virtual const char* name() const SK_OVERRIDE { return "DashingEffect"; } + const char* name() const SK_OVERRIDE { return "DashingEffect"; } const GrAttribute* inPosition() const { return fInPosition; } @@ -783,7 +783,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -795,9 +795,9 @@ private: DashingLineEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info, SkScalar strokeWidth, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrPrimitiveEdgeType fEdgeType; const GrAttribute* fInPosition; @@ -816,7 +816,7 @@ class GLDashingLineEffect : public GrGLGeometryProcessor { public: GLDashingLineEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp index 21fbb307c1..cdb6ff75e1 100755 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp @@ -35,7 +35,7 @@ public: #endif {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrDistanceFieldTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldTextureEffect>(); const DistanceFieldBatchTracker& local = args.fBT.cast<DistanceFieldBatchTracker>(); @@ -321,7 +321,7 @@ public: const GrBatchTracker&) : fColor(GrColor_ILLEGAL), fTextureSize(SkISize::Make(-1, -1)) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrDistanceFieldNoGammaTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldNoGammaTextureEffect>(); @@ -562,7 +562,7 @@ public: , fTextureSize(SkISize::Make(-1,-1)) , fTextColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrDistanceFieldLCDTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldLCDTextureEffect>(); const DistanceFieldLCDBatchTracker& local = args.fBT.cast<DistanceFieldLCDBatchTracker>(); diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h index 1be06df936..6edcf988d2 100644 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.h +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h @@ -66,7 +66,7 @@ public: virtual ~GrDistanceFieldTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } + const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inColor() const { return fInColor; } @@ -80,7 +80,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -96,9 +96,9 @@ private: #endif uint32_t flags, bool opaqueVertexColors); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; #ifdef SK_GAMMA_APPLY_TO_A8 @@ -133,7 +133,7 @@ public: virtual ~GrDistanceFieldNoGammaTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } + const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inColor() const { return fInColor; } @@ -144,7 +144,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -157,9 +157,9 @@ private: const GrTextureParams& params, uint32_t flags, bool opaqueVertexColors); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; uint32_t fFlags; @@ -190,7 +190,7 @@ public: virtual ~GrDistanceFieldLCDTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; } + const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inTextureCoords() const { return fInTextureCoords; } @@ -201,7 +201,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -215,9 +215,9 @@ private: GrTexture* gamma, const GrTextureParams& gammaParams, SkColor textColor, uint32_t flags); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; GrTextureAccess fGammaTextureAccess; diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index 799d970601..5e73e3bf50 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -24,11 +24,11 @@ public: virtual ~DitherEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Dither"; } + const char* name() const SK_OVERRIDE { return "Dither"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: DitherEffect() { @@ -37,9 +37,9 @@ private: } // All dither effects are equal - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index 6a710995a2..30f5b5e767 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -22,7 +22,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: typedef GrGLProgramDataManager::UniformHandle UniformHandle; diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 8d6bb7cc10..8f92175fae 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -60,11 +60,11 @@ public: bool convolveAlpha() const { return fConvolveAlpha; } const GrTextureDomain& domain() const { return fDomain; } - virtual const char* name() const SK_OVERRIDE { return "MatrixConvolution"; } + const char* name() const SK_OVERRIDE { return "MatrixConvolution"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: GrMatrixConvolutionEffect(GrTexture*, @@ -77,9 +77,9 @@ private: GrTextureDomain::Mode tileMode, bool convolveAlpha); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // TODO: Try to do better? inout->mulByUnknownFourComponents(); } diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index f1d1e68f29..314b000819 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -22,11 +22,11 @@ public: virtual ~CircleEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Circle"; } + const char* name() const SK_OVERRIDE { return "Circle"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkPoint& getCenter() const { return fCenter; } SkScalar getRadius() const { return fRadius; } @@ -36,9 +36,9 @@ public: private: CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkPoint fCenter; SkScalar fRadius; @@ -106,7 +106,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fCircleUniform; @@ -197,11 +197,11 @@ public: virtual ~EllipseEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Ellipse"; } + const char* name() const SK_OVERRIDE { return "Ellipse"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkPoint& getCenter() const { return fCenter; } SkVector getRadii() const { return fRadii; } @@ -211,9 +211,9 @@ public: private: EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkPoint fCenter; SkVector fRadii; @@ -284,7 +284,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fEllipseUniform; diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 2b10cadbf1..aecf685e62 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -38,7 +38,7 @@ public: virtual ~GrGLPorterDuffXferProcessor() {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrPorterDuffXferProcessor& xp = args.fXP.cast<GrPorterDuffXferProcessor>(); GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); if (xp.hasSecondaryOutput()) { @@ -86,7 +86,7 @@ public: } } - virtual void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; + void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; static void GenKey(const GrProcessor& processor, const GrGLCaps& caps, GrProcessorKeyBuilder* b) { diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 1c1bd18791..2cc0651f41 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -48,11 +48,11 @@ public: virtual ~CircularRRectEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "CircularRRect"; } + const char* name() const SK_OVERRIDE { return "CircularRRect"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkRRect& getRRect() const { return fRRect; } @@ -63,9 +63,9 @@ public: private: CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkRRect fRRect; GrPrimitiveEdgeType fEdgeType; @@ -141,7 +141,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fInnerRectUniform; @@ -392,11 +392,11 @@ public: virtual ~EllipticalRRectEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "EllipticalRRect"; } + const char* name() const SK_OVERRIDE { return "EllipticalRRect"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkRRect& getRRect() const { return fRRect; } @@ -405,9 +405,9 @@ public: private: EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&); - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkRRect fRRect; GrPrimitiveEdgeType fEdgeType; @@ -498,7 +498,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fInnerRectUniform; diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index 4b9268df24..8afc23583e 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -47,11 +47,11 @@ public: virtual ~GrSimpleTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "SimpleTexture"; } + const char* name() const SK_OVERRIDE { return "SimpleTexture"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: GrSimpleTextureEffect(GrTexture* texture, @@ -70,9 +70,9 @@ private: this->initClassID<GrSimpleTextureEffect>(); } - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 3531106ca8..9516595e60 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -176,7 +176,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h index 9e21c4a48e..3d8b5691c4 100644 --- a/src/gpu/effects/GrTextureDomain.h +++ b/src/gpu/effects/GrTextureDomain.h @@ -153,11 +153,11 @@ public: virtual ~GrTextureDomainEffect(); - virtual const char* name() const SK_OVERRIDE { return "TextureDomain"; } + const char* name() const SK_OVERRIDE { return "TextureDomain"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const GrTextureDomain& textureDomain() const { return fTextureDomain; } @@ -172,9 +172,9 @@ private: GrTextureParams::FilterMode, GrCoordSet); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp index e8c7ff7aca..736135282c 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp @@ -22,7 +22,7 @@ public: return SkNEW_ARGS(YUVtoRGBEffect, (yTexture, uTexture, vTexture, colorSpace)); } - virtual const char* name() const SK_OVERRIDE { return "YUV to RGB"; } + const char* name() const SK_OVERRIDE { return "YUV to RGB"; } SkYUVColorSpace getColorSpace() const { return fColorSpace; @@ -83,7 +83,7 @@ public: GLProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -104,12 +104,12 @@ private: this->addTextureAccess(&fVAccess); } - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>(); return fColorSpace == s.getColorSpace(); } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // YUV is opaque inout->setToOther(kA_GrColorComponentFlag, 0xFF << GrColor_SHIFT_A, GrInvariantOutput::kWillNot_ReadInput); diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index 0018263b02..7ccb1d9f5d 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -99,7 +99,7 @@ public: /** * Resets the caps such that nothing is supported. */ - virtual void reset() SK_OVERRIDE; + void reset() SK_OVERRIDE; /** * Initializes the GrGLCaps to the set of features supported in the current @@ -269,7 +269,7 @@ public: /** * Returns a string containing the caps info. */ - virtual SkString dump() const SK_OVERRIDE; + SkString dump() const SK_OVERRIDE; /** * LATC can appear under one of three possible names. In order to know diff --git a/src/gpu/gl/GrGLIndexBuffer.h b/src/gpu/gl/GrGLIndexBuffer.h index 0eb10bb662..3ff746e297 100644 --- a/src/gpu/gl/GrGLIndexBuffer.h +++ b/src/gpu/gl/GrGLIndexBuffer.h @@ -31,13 +31,13 @@ public: } protected: - virtual void onAbandon() SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; private: - virtual void* onMap() SK_OVERRIDE; - virtual void onUnmap() SK_OVERRIDE; - virtual bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE; + void* onMap() SK_OVERRIDE; + void onUnmap() SK_OVERRIDE; + bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE; GrGLGpu* getGpuGL() const { SkASSERT(!this->wasDestroyed()); diff --git a/src/gpu/gl/GrGLNameAllocator.cpp b/src/gpu/gl/GrGLNameAllocator.cpp index f2c37edbeb..9d60162f30 100644 --- a/src/gpu/gl/GrGLNameAllocator.cpp +++ b/src/gpu/gl/GrGLNameAllocator.cpp @@ -133,7 +133,7 @@ public: this->updateStats(); } - virtual SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE { + SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE { // Try allocating the range inside fLeft's internal gaps. fLeft.reset(fLeft->internalAllocate(outName)); if (0 != *outName) { @@ -160,7 +160,7 @@ public: return this->takeRef(); } - virtual SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE { + SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE { fLeft.reset(fLeft->removeLeftmostContiguousRange(removedCount)); if (NULL == fLeft) { return fRight.detach(); @@ -169,7 +169,7 @@ public: return this->rebalance(); } - virtual GrGLuint appendNames(GrGLuint count) SK_OVERRIDE { + GrGLuint appendNames(GrGLuint count) SK_OVERRIDE { SkASSERT(fEnd + count > fEnd); // Check for integer wrap. GrGLuint name = fRight->appendNames(count); SkASSERT(fRight->end() == fEnd + count); @@ -177,7 +177,7 @@ public: return name; } - virtual GrGLuint prependNames(GrGLuint count) SK_OVERRIDE { + GrGLuint prependNames(GrGLuint count) SK_OVERRIDE { SkASSERT(fFirst > count); // We can't allocate at or below 0. GrGLuint name = fLeft->prependNames(count); SkASSERT(fLeft->first() == fFirst - count); @@ -185,7 +185,7 @@ public: return name; } - virtual SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE { + SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE { if (name < fLeft->end()) { fLeft.reset(fLeft->free(name)); if (NULL == fLeft) { @@ -280,30 +280,30 @@ public: fHeight = 0; } - virtual SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE { + SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE { *outName = 0; // No internal gaps, we are contiguous. return this->takeRef(); } - virtual SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE { + SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE { *removedCount = fEnd - fFirst; return NULL; } - virtual GrGLuint appendNames(GrGLuint count) SK_OVERRIDE { + GrGLuint appendNames(GrGLuint count) SK_OVERRIDE { SkASSERT(fEnd + count > fEnd); // Check for integer wrap. GrGLuint name = fEnd; fEnd += count; return name; } - virtual GrGLuint prependNames(GrGLuint count) SK_OVERRIDE { + GrGLuint prependNames(GrGLuint count) SK_OVERRIDE { SkASSERT(fFirst > count); // We can't allocate at or below 0. fFirst -= count; return fFirst; } - virtual SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE { + SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE { if (name < fFirst || name >= fEnd) { // Not-allocated names are silently ignored. return this->takeRef(); diff --git a/src/gpu/gl/GrGLPath.h b/src/gpu/gl/GrGLPath.h index 57a26401ac..f048f8543b 100644 --- a/src/gpu/gl/GrGLPath.h +++ b/src/gpu/gl/GrGLPath.h @@ -31,12 +31,12 @@ public: GrGLuint pathID() const { return fPathID; } protected: - virtual void onRelease() SK_OVERRIDE; - virtual void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; private: // TODO: Figure out how to get an approximate size of the path in Gpu memory. - virtual size_t onGpuMemorySize() const SK_OVERRIDE { return 100; } + size_t onGpuMemorySize() const SK_OVERRIDE { return 100; } GrGLuint fPathID; diff --git a/src/gpu/gl/GrGLPathRange.h b/src/gpu/gl/GrGLPathRange.h index 17d44c2ae5..ce13a3a03f 100644 --- a/src/gpu/gl/GrGLPathRange.h +++ b/src/gpu/gl/GrGLPathRange.h @@ -42,13 +42,13 @@ public: GrGLuint basePathID() const { return fBasePathID; } protected: - virtual void onInitPath(int index, const SkPath&) const SK_OVERRIDE; + void onInitPath(int index, const SkPath&) const SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; - virtual void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; private: - virtual size_t onGpuMemorySize() const SK_OVERRIDE { return fGpuMemorySize; } + size_t onGpuMemorySize() const SK_OVERRIDE { return fGpuMemorySize; } GrGLuint fBasePathID; mutable size_t fGpuMemorySize; diff --git a/src/gpu/gl/GrGLPathRendering.h b/src/gpu/gl/GrGLPathRendering.h index 0ebf470ada..ac56a9231b 100644 --- a/src/gpu/gl/GrGLPathRendering.h +++ b/src/gpu/gl/GrGLPathRendering.h @@ -33,14 +33,14 @@ public: virtual ~GrGLPathRendering(); // GrPathRendering implementations. - virtual GrPath* createPath(const SkPath&, const SkStrokeRec&) SK_OVERRIDE; + GrPath* createPath(const SkPath&, const SkStrokeRec&) SK_OVERRIDE; virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*, const SkStrokeRec&) SK_OVERRIDE; virtual GrPathRange* createGlyphs(const SkTypeface*, const SkDescriptor*, const SkStrokeRec&) SK_OVERRIDE; - virtual void stencilPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE; - virtual void drawPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE; + void stencilPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE; + void drawPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE; virtual void drawPaths(const GrPathRange*, const void* indices, PathIndexType, const float transformValues[], PathTransformType, int count, const GrStencilSettings&) SK_OVERRIDE; diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 6e7e22bcad..e70fee738f 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -183,7 +183,7 @@ protected: class GrGLNvprProgram : public GrGLNvprProgramBase { public: - virtual bool hasVertexShader() const SK_OVERRIDE { return true; } + bool hasVertexShader() const SK_OVERRIDE { return true; } private: typedef GrGLNvprProgramBuilder::SeparableVaryingInfo SeparableVaryingInfo; @@ -197,7 +197,7 @@ private: GrGLInstalledXferProc* xferProcessor, GrGLInstalledFragProcs* fragmentProcessors, const SeparableVaryingInfoArray& separableVaryings); - virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE; + void didSetData(GrGpu::DrawType) SK_OVERRIDE; virtual void setTransformData(const GrPendingFragmentStage&, const SkMatrix& localMatrix, GrGLInstalledFragProc*) SK_OVERRIDE; @@ -217,7 +217,7 @@ private: class GrGLLegacyNvprProgram : public GrGLNvprProgramBase { public: - virtual bool hasVertexShader() const SK_OVERRIDE { return false; } + bool hasVertexShader() const SK_OVERRIDE { return false; } private: GrGLLegacyNvprProgram(GrGLGpu* gpu, @@ -229,7 +229,7 @@ private: GrGLInstalledXferProc* xp, GrGLInstalledFragProcs* fps, int texCoordSetCnt); - virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE; + void didSetData(GrGpu::DrawType) SK_OVERRIDE; virtual void setTransformData(const GrPendingFragmentStage&, const SkMatrix& localMatrix, GrGLInstalledFragProc*) SK_OVERRIDE; diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h index adc967f7be..09de571b9d 100644 --- a/src/gpu/gl/GrGLRenderTarget.h +++ b/src/gpu/gl/GrGLRenderTarget.h @@ -42,9 +42,9 @@ public: GrGLuint textureFBOID() const { return fTexFBOID; } // override of GrRenderTarget - virtual GrBackendObject getRenderTargetHandle() const SK_OVERRIDE { return this->renderFBOID(); } - virtual GrBackendObject getRenderTargetResolvedHandle() const SK_OVERRIDE { return this->textureFBOID(); } - virtual ResolveType getResolveType() const SK_OVERRIDE { + GrBackendObject getRenderTargetHandle() const SK_OVERRIDE { return this->renderFBOID(); } + GrBackendObject getRenderTargetResolvedHandle() const SK_OVERRIDE { return this->textureFBOID(); } + ResolveType getResolveType() const SK_OVERRIDE { if (!this->isMultisampled() || fRTFBOID == fTexFBOID) { // catches FBO 0 and non MSAA case @@ -65,11 +65,11 @@ protected: void init(const GrSurfaceDesc&, const IDDesc&); - virtual void onAbandon() SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; // In protected because subclass GrGLTextureRenderTarget calls this version. - virtual size_t onGpuMemorySize() const SK_OVERRIDE; + size_t onGpuMemorySize() const SK_OVERRIDE; private: GrGLuint fRTFBOID; diff --git a/src/gpu/gl/GrGLStencilBuffer.h b/src/gpu/gl/GrGLStencilBuffer.h index ff0d5cb4d0..c5540914b5 100644 --- a/src/gpu/gl/GrGLStencilBuffer.h +++ b/src/gpu/gl/GrGLStencilBuffer.h @@ -43,11 +43,11 @@ public: protected: // overrides of GrResource - virtual void onRelease() SK_OVERRIDE; - virtual void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; private: - virtual size_t onGpuMemorySize() const SK_OVERRIDE; + size_t onGpuMemorySize() const SK_OVERRIDE; Format fFormat; // may be zero for external SBs associated with external RTs diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h index 7c64e17b9d..cc8adeb7ce 100644 --- a/src/gpu/gl/GrGLTexture.h +++ b/src/gpu/gl/GrGLTexture.h @@ -33,9 +33,9 @@ public: GrGLTexture(GrGLGpu*, const GrSurfaceDesc&, const IDDesc&); - virtual GrBackendObject getTextureHandle() const SK_OVERRIDE; + GrBackendObject getTextureHandle() const SK_OVERRIDE; - virtual void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); } + void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); } // These functions are used to track the texture parameters associated with the texture. const TexParams& getCachedTexParams(GrGpu::ResetTimestamp* timestamp) const { @@ -60,8 +60,8 @@ protected: void init(const GrSurfaceDesc&, const IDDesc&); - virtual void onAbandon() SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; private: TexParams fTexParams; diff --git a/src/gpu/gl/GrGLTextureRenderTarget.h b/src/gpu/gl/GrGLTextureRenderTarget.h index 69f70c492a..af0fde4f02 100644 --- a/src/gpu/gl/GrGLTextureRenderTarget.h +++ b/src/gpu/gl/GrGLTextureRenderTarget.h @@ -35,19 +35,19 @@ public: } protected: - virtual void onAbandon() SK_OVERRIDE { + void onAbandon() SK_OVERRIDE { GrGLRenderTarget::onAbandon(); GrGLTexture::onAbandon(); } - virtual void onRelease() SK_OVERRIDE { + void onRelease() SK_OVERRIDE { GrGLRenderTarget::onRelease(); GrGLTexture::onRelease(); } private: // GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuffer's memory. - virtual size_t onGpuMemorySize() const SK_OVERRIDE { + size_t onGpuMemorySize() const SK_OVERRIDE { return GrGLRenderTarget::onGpuMemorySize(); } diff --git a/src/gpu/gl/GrGLVertexArray.h b/src/gpu/gl/GrGLVertexArray.h index 792fd940e7..f795ed85d2 100644 --- a/src/gpu/gl/GrGLVertexArray.h +++ b/src/gpu/gl/GrGLVertexArray.h @@ -160,11 +160,11 @@ public: void invalidateCachedState(); protected: - virtual size_t onGpuMemorySize() const SK_OVERRIDE { return 0; } + size_t onGpuMemorySize() const SK_OVERRIDE { return 0; } - virtual void onAbandon() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; private: GrGLuint fID; diff --git a/src/gpu/gl/GrGLVertexBuffer.h b/src/gpu/gl/GrGLVertexBuffer.h index ea2e37dfb8..c428f4dbcd 100644 --- a/src/gpu/gl/GrGLVertexBuffer.h +++ b/src/gpu/gl/GrGLVertexBuffer.h @@ -31,13 +31,13 @@ public: } protected: - virtual void onAbandon() SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; private: - virtual void* onMap() SK_OVERRIDE; - virtual void onUnmap() SK_OVERRIDE; - virtual bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE; + void* onMap() SK_OVERRIDE; + void onUnmap() SK_OVERRIDE; + bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE; GrGLGpu* getGpuGL() const { SkASSERT(!this->wasDestroyed()); diff --git a/src/gpu/gl/SkNullGLContext.h b/src/gpu/gl/SkNullGLContext.h index 92ac11aeec..b0432ba2e6 100644 --- a/src/gpu/gl/SkNullGLContext.h +++ b/src/gpu/gl/SkNullGLContext.h @@ -12,9 +12,9 @@ class SK_API SkNullGLContext : public SkGLContext { public: - virtual ~SkNullGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE {}; - virtual void swapBuffers() const SK_OVERRIDE {}; + ~SkNullGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE {}; + void swapBuffers() const SK_OVERRIDE {}; static SkNullGLContext* Create(GrGLStandard forcedGpuAPI) { if (kGLES_GrGLStandard == forcedGpuAPI) { diff --git a/src/gpu/gl/angle/SkANGLEGLContext.h b/src/gpu/gl/angle/SkANGLEGLContext.h index dec3f9f2a7..604de42b37 100644 --- a/src/gpu/gl/angle/SkANGLEGLContext.h +++ b/src/gpu/gl/angle/SkANGLEGLContext.h @@ -17,9 +17,9 @@ class SkANGLEGLContext : public SkGLContext { public: - virtual ~SkANGLEGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE; - virtual void swapBuffers() const SK_OVERRIDE; + ~SkANGLEGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE; + void swapBuffers() const SK_OVERRIDE; static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI) { if (kGL_GrGLStandard == forcedGpuAPI) { diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h index 456ec4f27c..8e8a008e00 100644 --- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h +++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h @@ -87,11 +87,11 @@ public: GrGLFragmentShaderBuilder(GrGLProgramBuilder* program, uint8_t fragPosKey); // true public interface, defined explicitly in the abstract interfaces above - virtual bool enableFeature(GLSLFeature) SK_OVERRIDE; + bool enableFeature(GLSLFeature) SK_OVERRIDE; virtual SkString ensureFSCoords2D(const GrGLProcessor::TransformedCoordsArray& coords, int index) SK_OVERRIDE; - virtual const char* fragmentPosition() SK_OVERRIDE; - virtual const char* dstColor() SK_OVERRIDE; + const char* fragmentPosition() SK_OVERRIDE; + const char* dstColor() SK_OVERRIDE; private: // Private public interface, used by GrGLProgramBuilder to build a fragment shader diff --git a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h index f34f6ccd26..519e87aa09 100644 --- a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h @@ -14,7 +14,7 @@ class GrGLLegacyNvprProgramBuilder : public GrGLProgramBuilder { public: GrGLLegacyNvprProgramBuilder(GrGLGpu*, const GrOptDrawState&); - virtual GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE; + GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE; private: int addTexCoordSets(int count); diff --git a/src/gpu/gl/builders/GrGLNvprProgramBuilder.h b/src/gpu/gl/builders/GrGLNvprProgramBuilder.h index cfb07fd254..83a35586f9 100644 --- a/src/gpu/gl/builders/GrGLNvprProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLNvprProgramBuilder.h @@ -25,7 +25,7 @@ public: typedef GrTAllocator<SeparableVaryingInfo> SeparableVaryingInfoArray; - virtual GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE; + GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE; private: virtual void emitTransforms(const GrPendingFragmentStage&, diff --git a/src/gpu/gl/debug/GrBufferObj.h b/src/gpu/gl/debug/GrBufferObj.h index 5c282eef31..d0bb83d62c 100644 --- a/src/gpu/gl/debug/GrBufferObj.h +++ b/src/gpu/gl/debug/GrBufferObj.h @@ -55,7 +55,7 @@ public: void setUsage(GrGLint usage) { fUsage = usage; } GrGLint getUsage() const { return fUsage; } - virtual void deleteAction() SK_OVERRIDE; + void deleteAction() SK_OVERRIDE; protected: private: diff --git a/src/gpu/gl/debug/GrFrameBufferObj.h b/src/gpu/gl/debug/GrFrameBufferObj.h index 33af4f7a97..3cfa23686b 100644 --- a/src/gpu/gl/debug/GrFrameBufferObj.h +++ b/src/gpu/gl/debug/GrFrameBufferObj.h @@ -46,7 +46,7 @@ public: void setStencil(GrFBBindableObj *buffer); GrFBBindableObj *getStencil() { return fStencilBuffer; } - virtual void deleteAction() SK_OVERRIDE { + void deleteAction() SK_OVERRIDE { setColor(NULL); setDepth(NULL); diff --git a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp index f6b497432a..77a1422af1 100644 --- a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp +++ b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp @@ -796,7 +796,7 @@ public: fWrapped.reset(interface); } - virtual void abandon() const SK_OVERRIDE { + void abandon() const SK_OVERRIDE { GrDebugGL::abandon(); } diff --git a/src/gpu/gl/debug/GrProgramObj.h b/src/gpu/gl/debug/GrProgramObj.h index eebcc88850..d06e410463 100644 --- a/src/gpu/gl/debug/GrProgramObj.h +++ b/src/gpu/gl/debug/GrProgramObj.h @@ -24,7 +24,7 @@ public: void AttachShader(GrShaderObj *shader); - virtual void deleteAction() SK_OVERRIDE; + void deleteAction() SK_OVERRIDE; // TODO: this flag system won't work w/ multiple contexts! void setInUse() { fInUse = true; } diff --git a/src/gpu/gl/debug/GrRenderBufferObj.h b/src/gpu/gl/debug/GrRenderBufferObj.h index 344b90e5a9..2ad3e2cbde 100644 --- a/src/gpu/gl/debug/GrRenderBufferObj.h +++ b/src/gpu/gl/debug/GrRenderBufferObj.h @@ -25,7 +25,7 @@ public: void resetBound() { fBound = false; } bool getBound() const { return fBound; } - virtual void deleteAction() SK_OVERRIDE { + void deleteAction() SK_OVERRIDE { this->INHERITED::deleteAction(); } diff --git a/src/gpu/gl/debug/GrShaderObj.h b/src/gpu/gl/debug/GrShaderObj.h index 0b888fa0b2..c59d9c9453 100644 --- a/src/gpu/gl/debug/GrShaderObj.h +++ b/src/gpu/gl/debug/GrShaderObj.h @@ -24,7 +24,7 @@ public: void setType(GrGLenum type) { fType = type; } GrGLenum getType() { return fType; } - virtual void deleteAction() SK_OVERRIDE; + void deleteAction() SK_OVERRIDE; protected: private: diff --git a/src/gpu/gl/debug/GrTextureObj.h b/src/gpu/gl/debug/GrTextureObj.h index 7673cd118e..653e23fdbc 100644 --- a/src/gpu/gl/debug/GrTextureObj.h +++ b/src/gpu/gl/debug/GrTextureObj.h @@ -43,7 +43,7 @@ public: return 0 != fTextureUnitReferees.count(); } - virtual void deleteAction() SK_OVERRIDE; + void deleteAction() SK_OVERRIDE; protected: diff --git a/src/gpu/gl/debug/SkDebugGLContext.h b/src/gpu/gl/debug/SkDebugGLContext.h index 7dca67f320..35e4456c86 100644 --- a/src/gpu/gl/debug/SkDebugGLContext.h +++ b/src/gpu/gl/debug/SkDebugGLContext.h @@ -12,9 +12,9 @@ class SkDebugGLContext : public SkGLContext { public: - virtual ~SkDebugGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE {} - virtual void swapBuffers() const SK_OVERRIDE {} + ~SkDebugGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE {} + void swapBuffers() const SK_OVERRIDE {} static SkDebugGLContext* Create(GrGLStandard forcedGpuAPI) { if (kGLES_GrGLStandard == forcedGpuAPI) { diff --git a/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp b/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp index 1974197f3e..9f35981e1a 100644 --- a/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp +++ b/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp @@ -15,9 +15,9 @@ namespace { class EGLGLContext : public SkGLContext { public: EGLGLContext(GrGLStandard forcedGpuAPI); - virtual ~EGLGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE; - virtual void swapBuffers() const SK_OVERRIDE; + ~EGLGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE; + void swapBuffers() const SK_OVERRIDE; private: void destroyGLContext(); diff --git a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp b/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp index f9977b2a46..9efa993b24 100644 --- a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp +++ b/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp @@ -47,9 +47,9 @@ static int ctxErrorHandler(Display *dpy, XErrorEvent *ev) { class GLXGLContext : public SkGLContext { public: GLXGLContext(GrGLStandard forcedGpuAPI); - virtual ~GLXGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE; - virtual void swapBuffers() const SK_OVERRIDE; + ~GLXGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE; + void swapBuffers() const SK_OVERRIDE; private: void destroyGLContext(); diff --git a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm b/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm index 423ef8cbdd..f900976f95 100644 --- a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm +++ b/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm @@ -16,9 +16,9 @@ namespace { class IOSGLContext : public SkGLContext { public: IOSGLContext(); - virtual ~IOSGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE; - virtual void swapBuffers() const SK_OVERRIDE; + ~IOSGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE; + void swapBuffers() const SK_OVERRIDE; private: void destroyGLContext(); diff --git a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp b/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp index 5ae1aeb3c7..e7f21e0aae 100644 --- a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp +++ b/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp @@ -14,9 +14,9 @@ namespace { class MacGLContext : public SkGLContext { public: MacGLContext(); - virtual ~MacGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE; - virtual void swapBuffers() const SK_OVERRIDE; + ~MacGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE; + void swapBuffers() const SK_OVERRIDE; private: void destroyGLContext(); diff --git a/src/gpu/gl/mesa/SkMesaGLContext.h b/src/gpu/gl/mesa/SkMesaGLContext.h index 0fc5162319..df7e0b0770 100644 --- a/src/gpu/gl/mesa/SkMesaGLContext.h +++ b/src/gpu/gl/mesa/SkMesaGLContext.h @@ -17,9 +17,9 @@ private: typedef intptr_t Context; public: - virtual ~SkMesaGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE; - virtual void swapBuffers() const SK_OVERRIDE; + ~SkMesaGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE; + void swapBuffers() const SK_OVERRIDE; static SkMesaGLContext* Create(GrGLStandard forcedGpuAPI) { if (kGLES_GrGLStandard == forcedGpuAPI) { diff --git a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp index 890c7849ba..5f3d364408 100644 --- a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp +++ b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp @@ -20,9 +20,9 @@ namespace { class WinGLContext : public SkGLContext { public: WinGLContext(GrGLStandard forcedGpuAPI); - virtual ~WinGLContext() SK_OVERRIDE; - virtual void makeCurrent() const SK_OVERRIDE; - virtual void swapBuffers() const SK_OVERRIDE; + ~WinGLContext() SK_OVERRIDE; + void makeCurrent() const SK_OVERRIDE; + void swapBuffers() const SK_OVERRIDE; private: void destroyGLContext(); diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index 01a287bdc4..4636686e8d 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -68,7 +68,7 @@ public: SkShader::TileMode, const SkMatrix* localMatrix) const SK_OVERRIDE; - virtual bool isOpaque() const SK_OVERRIDE; + bool isOpaque() const SK_OVERRIDE; SkImage_Raster(const SkBitmap& bm, const SkSurfaceProps* props) : INHERITED(bm.width(), bm.height(), props) diff --git a/src/image/SkSurface_Gpu.h b/src/image/SkSurface_Gpu.h index a02eb3e904..4a49272d3a 100644 --- a/src/image/SkSurface_Gpu.h +++ b/src/image/SkSurface_Gpu.h @@ -21,13 +21,13 @@ public: SkSurface_Gpu(GrRenderTarget*, const SkSurfaceProps*, bool doClear); virtual ~SkSurface_Gpu(); - virtual SkCanvas* onNewCanvas() SK_OVERRIDE; - virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE; - virtual SkImage* onNewImageSnapshot() SK_OVERRIDE; + SkCanvas* onNewCanvas() SK_OVERRIDE; + SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE; + SkImage* onNewImageSnapshot() SK_OVERRIDE; virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) SK_OVERRIDE; - virtual void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE; - virtual void onDiscard() SK_OVERRIDE; + void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE; + void onDiscard() SK_OVERRIDE; SkGpuDevice* getDevice() { return fDevice; } diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 2bac3f3156..0752383eec 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -22,12 +22,12 @@ public: const SkSurfaceProps*); SkSurface_Raster(SkPixelRef*, const SkSurfaceProps*); - virtual SkCanvas* onNewCanvas() SK_OVERRIDE; - virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE; - virtual SkImage* onNewImageSnapshot() SK_OVERRIDE; + SkCanvas* onNewCanvas() SK_OVERRIDE; + SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE; + SkImage* onNewImageSnapshot() SK_OVERRIDE; virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) SK_OVERRIDE; - virtual void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE; + void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE; private: SkBitmap fBitmap; diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp index d5c2ba8818..baa112c303 100644 --- a/src/images/SkDecodingImageGenerator.cpp +++ b/src/images/SkDecodingImageGenerator.cpp @@ -37,8 +37,8 @@ public: bool ditherImage); protected: - virtual SkData* onRefEncodedData() SK_OVERRIDE; - virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { + SkData* onRefEncodedData() SK_OVERRIDE; + bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { *info = fInfo; return true; } diff --git a/src/images/SkImageDecoder_astc.cpp b/src/images/SkImageDecoder_astc.cpp index 96d28f8569..64cdf43e5d 100644 --- a/src/images/SkImageDecoder_astc.cpp +++ b/src/images/SkImageDecoder_astc.cpp @@ -19,12 +19,12 @@ class SkASTCImageDecoder : public SkImageDecoder { public: SkASTCImageDecoder() { } - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kASTC_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp index 8ef592adc9..7248950450 100644 --- a/src/images/SkImageDecoder_ktx.cpp +++ b/src/images/SkImageDecoder_ktx.cpp @@ -36,12 +36,12 @@ class SkKTXImageDecoder : public SkImageDecoder { public: SkKTXImageDecoder() { } - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kKTX_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; @@ -251,7 +251,7 @@ SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* b class SkKTXImageEncoder : public SkImageEncoder { protected: - virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; + bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; private: virtual bool encodePKM(SkWStream* stream, const SkData *data); diff --git a/src/images/SkImageDecoder_libbmp.cpp b/src/images/SkImageDecoder_libbmp.cpp index af868e30a7..e28713d8a6 100644 --- a/src/images/SkImageDecoder_libbmp.cpp +++ b/src/images/SkImageDecoder_libbmp.cpp @@ -19,12 +19,12 @@ class SkBMPImageDecoder : public SkImageDecoder { public: SkBMPImageDecoder() {} - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kBMP_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; diff --git a/src/images/SkImageDecoder_libgif.cpp b/src/images/SkImageDecoder_libgif.cpp index 1d0e500206..0701eb68ae 100644 --- a/src/images/SkImageDecoder_libgif.cpp +++ b/src/images/SkImageDecoder_libgif.cpp @@ -19,12 +19,12 @@ class SkGIFImageDecoder : public SkImageDecoder { public: - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kGIF_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp index a3297062ce..3ca19084da 100644 --- a/src/images/SkImageDecoder_libico.cpp +++ b/src/images/SkImageDecoder_libico.cpp @@ -15,12 +15,12 @@ class SkICOImageDecoder : public SkImageDecoder { public: SkICOImageDecoder(); - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kICO_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index f25fb9fcce..8c9d26783c 100644 --- a/src/images/SkImageDecoder_libjpeg.cpp +++ b/src/images/SkImageDecoder_libjpeg.cpp @@ -229,16 +229,16 @@ public: } #endif - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kJPEG_Format; } protected: #ifdef SK_BUILD_FOR_ANDROID - virtual bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE; - virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE; + bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE; + bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE; #endif - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; virtual bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3], void* planes[3], size_t rowBytes[3], SkYUVColorSpace* colorSpace) SK_OVERRIDE; diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp index e997fdbd7e..c3bba6e07a 100644 --- a/src/images/SkImageDecoder_libpng.cpp +++ b/src/images/SkImageDecoder_libpng.cpp @@ -78,7 +78,7 @@ public: SkPNGImageDecoder() { fImageIndex = NULL; } - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kPNG_Format; } @@ -88,10 +88,10 @@ public: protected: #ifdef SK_BUILD_FOR_ANDROID - virtual bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE; - virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& region) SK_OVERRIDE; + bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE; + bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& region) SK_OVERRIDE; #endif - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: SkPNGImageIndex* fImageIndex; @@ -1090,7 +1090,7 @@ static inline int pack_palette(SkColorTable* ctable, class SkPNGImageEncoder : public SkImageEncoder { protected: - virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; + bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; private: bool doEncode(SkWStream* stream, const SkBitmap& bm, const bool& hasAlpha, int colorType, diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp index d5caf702ee..c56933dd2a 100644 --- a/src/images/SkImageDecoder_libwebp.cpp +++ b/src/images/SkImageDecoder_libwebp.cpp @@ -104,14 +104,14 @@ public: SkSafeUnref(fInputStream); } - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kWEBP_Format; } protected: - virtual bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE; - virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE; - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE; + bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: /** @@ -588,7 +588,7 @@ static int stream_writer(const uint8_t* data, size_t data_size, class SkWEBPImageEncoder : public SkImageEncoder { protected: - virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; + bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; private: typedef SkImageEncoder INHERITED; diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp index 17ef2f3037..c607c6f852 100644 --- a/src/images/SkImageDecoder_pkm.cpp +++ b/src/images/SkImageDecoder_pkm.cpp @@ -19,12 +19,12 @@ class SkPKMImageDecoder : public SkImageDecoder { public: SkPKMImageDecoder() { } - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kPKM_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp index 7a6f76ed34..1f506dbc4d 100644 --- a/src/images/SkImageDecoder_wbmp.cpp +++ b/src/images/SkImageDecoder_wbmp.cpp @@ -17,12 +17,12 @@ class SkWBMPImageDecoder : public SkImageDecoder { public: - virtual Format getFormat() const SK_OVERRIDE { + Format getFormat() const SK_OVERRIDE { return kWBMP_Format; } protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; private: typedef SkImageDecoder INHERITED; diff --git a/src/images/SkImageEncoder_argb.cpp b/src/images/SkImageEncoder_argb.cpp index 02d5490452..6bc906fe23 100644 --- a/src/images/SkImageEncoder_argb.cpp +++ b/src/images/SkImageEncoder_argb.cpp @@ -13,7 +13,7 @@ class SkARGBImageEncoder : public SkImageEncoder { protected: - virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; + bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE; private: typedef SkImageEncoder INHERITED; diff --git a/src/images/SkScaledBitmapSampler.cpp b/src/images/SkScaledBitmapSampler.cpp index 8bb1bde7c4..123b85f56a 100644 --- a/src/images/SkScaledBitmapSampler.cpp +++ b/src/images/SkScaledBitmapSampler.cpp @@ -834,7 +834,7 @@ class DummyDecoder : public SkImageDecoder { public: DummyDecoder() {} protected: - virtual Result onDecode(SkStream*, SkBitmap*, SkImageDecoder::Mode) SK_OVERRIDE { + Result onDecode(SkStream*, SkBitmap*, SkImageDecoder::Mode) SK_OVERRIDE { return kFailure; } }; diff --git a/src/lazy/SkCachingPixelRef.h b/src/lazy/SkCachingPixelRef.h index 306f714169..a46df14496 100644 --- a/src/lazy/SkCachingPixelRef.h +++ b/src/lazy/SkCachingPixelRef.h @@ -42,11 +42,11 @@ public: protected: virtual ~SkCachingPixelRef(); - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; - virtual void onUnlockPixels() SK_OVERRIDE; - virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; } + bool onNewLockPixels(LockRec*) SK_OVERRIDE; + void onUnlockPixels() SK_OVERRIDE; + bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; } - virtual SkData* onRefEncodedData() SK_OVERRIDE { + SkData* onRefEncodedData() SK_OVERRIDE { return fImageGenerator->refEncodedData(); } diff --git a/src/lazy/SkDiscardableMemoryPool.cpp b/src/lazy/SkDiscardableMemoryPool.cpp index 96d6046f3f..2da8335ff8 100644 --- a/src/lazy/SkDiscardableMemoryPool.cpp +++ b/src/lazy/SkDiscardableMemoryPool.cpp @@ -32,19 +32,19 @@ public: DiscardableMemoryPool(size_t budget, SkBaseMutex* mutex = NULL); virtual ~DiscardableMemoryPool(); - virtual SkDiscardableMemory* create(size_t bytes) SK_OVERRIDE; + SkDiscardableMemory* create(size_t bytes) SK_OVERRIDE; - virtual size_t getRAMUsed() SK_OVERRIDE; - virtual void setRAMBudget(size_t budget) SK_OVERRIDE; - virtual size_t getRAMBudget() SK_OVERRIDE { return fBudget; } + size_t getRAMUsed() SK_OVERRIDE; + void setRAMBudget(size_t budget) SK_OVERRIDE; + size_t getRAMBudget() SK_OVERRIDE { return fBudget; } /** purges all unlocked DMs */ - virtual void dumpPool() SK_OVERRIDE; + void dumpPool() SK_OVERRIDE; #if SK_LAZY_CACHE_STATS // Defined in SkDiscardableMemoryPool.h - virtual int getCacheHits() SK_OVERRIDE { return fCacheHits; } - virtual int getCacheMisses() SK_OVERRIDE { return fCacheMisses; } - virtual void resetCacheHitsAndMisses() SK_OVERRIDE { + int getCacheHits() SK_OVERRIDE { return fCacheHits; } + int getCacheMisses() SK_OVERRIDE { return fCacheMisses; } + void resetCacheHitsAndMisses() SK_OVERRIDE { fCacheHits = fCacheMisses = 0; } int fCacheHits; @@ -80,9 +80,9 @@ public: PoolDiscardableMemory(DiscardableMemoryPool* pool, void* pointer, size_t bytes); virtual ~PoolDiscardableMemory(); - virtual bool lock() SK_OVERRIDE; - virtual void* data() SK_OVERRIDE; - virtual void unlock() SK_OVERRIDE; + bool lock() SK_OVERRIDE; + void* data() SK_OVERRIDE; + void unlock() SK_OVERRIDE; friend class DiscardableMemoryPool; private: SK_DECLARE_INTERNAL_LLIST_INTERFACE(PoolDiscardableMemory); diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h index 142c8a4539..448f0ab24b 100644 --- a/src/lazy/SkDiscardablePixelRef.h +++ b/src/lazy/SkDiscardablePixelRef.h @@ -25,11 +25,11 @@ public: protected: ~SkDiscardablePixelRef(); - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; - virtual void onUnlockPixels() SK_OVERRIDE; - virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; } + bool onNewLockPixels(LockRec*) SK_OVERRIDE; + void onUnlockPixels() SK_OVERRIDE; + bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; } - virtual SkData* onRefEncodedData() SK_OVERRIDE { + SkData* onRefEncodedData() SK_OVERRIDE { return fGenerator->refEncodedData(); } diff --git a/src/pdf/SkPDFDeviceFlattener.h b/src/pdf/SkPDFDeviceFlattener.h index 56f8da720a..b2c3d7ec26 100644 --- a/src/pdf/SkPDFDeviceFlattener.h +++ b/src/pdf/SkPDFDeviceFlattener.h @@ -30,7 +30,7 @@ public: virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], const SkPaint& paint) SK_OVERRIDE; - virtual void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) SK_OVERRIDE; + void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) SK_OVERRIDE; virtual void drawPath(const SkDraw&, const SkPath& origpath, const SkPaint& paint, const SkMatrix* prePathMatrix, bool pathIsMutable) SK_OVERRIDE; diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp index 7023cfcd43..40f7d93f89 100644 --- a/src/pdf/SkPDFShader.cpp +++ b/src/pdf/SkPDFShader.cpp @@ -515,7 +515,7 @@ public: fResources.unrefAll(); } - virtual bool isValid() SK_OVERRIDE { return fResources.count() > 0; } + bool isValid() SK_OVERRIDE { return fResources.count() > 0; } void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects, SkTSet<SkPDFObject*>* newResourceObjects) SK_OVERRIDE { @@ -548,7 +548,7 @@ public: } } - virtual bool isValid() SK_OVERRIDE { + bool isValid() SK_OVERRIDE { return fColorShader.get() != NULL; } @@ -578,7 +578,7 @@ public: fResources.unrefAll(); } - virtual bool isValid() SK_OVERRIDE { return size() > 0; } + bool isValid() SK_OVERRIDE { return size() > 0; } void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects, SkTSet<SkPDFObject*>* newResourceObjects) SK_OVERRIDE { diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp index dab6178cfe..aa108e602e 100644 --- a/src/pipe/SkGPipeRead.cpp +++ b/src/pipe/SkGPipeRead.cpp @@ -162,7 +162,7 @@ public: * these SkBitmaps for bitmap shaders. Used only in cross process mode * without a shared heap. */ - virtual SkBitmap* getBitmap(int32_t index) const SK_OVERRIDE { + SkBitmap* getBitmap(int32_t index) const SK_OVERRIDE { SkASSERT(shouldFlattenBitmaps(fFlags)); return fBitmaps[index]; } @@ -170,7 +170,7 @@ public: /** * Needed to be a non-abstract subclass of SkBitmapHeapReader. */ - virtual void releaseRef(int32_t) SK_OVERRIDE {} + void releaseRef(int32_t) SK_OVERRIDE {} void setSharedHeap(SkBitmapHeap* heap) { SkASSERT(!shouldFlattenBitmaps(fFlags) || NULL == heap); diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index 6044360933..be687f7d31 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -86,9 +86,9 @@ public: fPointers.freeAll(); } - virtual void* allocThrow(size_t bytes) SK_OVERRIDE; + void* allocThrow(size_t bytes) SK_OVERRIDE; - virtual void unalloc(void* ptr) SK_OVERRIDE; + void unalloc(void* ptr) SK_OVERRIDE; void setBitmapStorage(SkBitmapHeap* heap) { this->setBitmapHeap(heap); @@ -175,7 +175,7 @@ public: ~BitmapShuttle(); - virtual bool insert(const SkBitmap& bitmap, int32_t slot) SK_OVERRIDE; + bool insert(const SkBitmap& bitmap, int32_t slot) SK_OVERRIDE; /** * Remove the SkGPipeCanvas used for insertion. After this, calls to @@ -231,9 +231,9 @@ public: return (NULL == fBitmapHeap) ? 0 : fBitmapHeap->bytesAllocated(); } - virtual void beginCommentGroup(const char* description) SK_OVERRIDE; - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; - virtual void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) SK_OVERRIDE; + void addComment(const char* kywd, const char* value) SK_OVERRIDE; + void endCommentGroup() SK_OVERRIDE; /** * Flatten an SkBitmap to send to the reader, where it will be referenced @@ -242,14 +242,14 @@ public: bool shuttleBitmap(const SkBitmap&, int32_t slot); protected: - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], @@ -286,12 +286,12 @@ protected: const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; private: void recordTranslate(const SkMatrix&); diff --git a/src/pipe/utils/SamplePipeControllers.h b/src/pipe/utils/SamplePipeControllers.h index 35cfba73b6..3442c49d67 100644 --- a/src/pipe/utils/SamplePipeControllers.h +++ b/src/pipe/utils/SamplePipeControllers.h @@ -18,8 +18,8 @@ class PipeController : public SkGPipeController { public: PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc = NULL); virtual ~PipeController(); - virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; - virtual void notifyWritten(size_t bytes) SK_OVERRIDE; + void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; + void notifyWritten(size_t bytes) SK_OVERRIDE; protected: const void* getData() { return (const char*) fBlock + fBytesWritten; } SkGPipeReader fReader; @@ -37,8 +37,8 @@ public: TiledPipeController(const SkBitmap&, SkPicture::InstallPixelRefProc proc = NULL, const SkMatrix* initialMatrix = NULL); virtual ~TiledPipeController() {}; - virtual void notifyWritten(size_t bytes) SK_OVERRIDE; - virtual int numberOfReaders() const SK_OVERRIDE { return NumberOfTiles; } + void notifyWritten(size_t bytes) SK_OVERRIDE; + int numberOfReaders() const SK_OVERRIDE { return NumberOfTiles; } private: enum { NumberOfTiles = 10 @@ -57,9 +57,9 @@ private: class ThreadSafePipeController : public SkGPipeController { public: ThreadSafePipeController(int numberOfReaders); - virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; - virtual void notifyWritten(size_t bytes) SK_OVERRIDE; - virtual int numberOfReaders() const SK_OVERRIDE { return fNumberOfReaders; } + void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; + void notifyWritten(size_t bytes) SK_OVERRIDE; + int numberOfReaders() const SK_OVERRIDE { return fNumberOfReaders; } /** * Play the stored drawing commands to the specified canvas. If SkGPipeWriter::startRecording diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index 039d8689ee..124ca2a907 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -112,10 +112,10 @@ public: FontIdentity* outFontIdentifier, SkString* outFamilyName, SkTypeface::Style* outStyle) SK_OVERRIDE; - virtual SkStream* openStream(const FontIdentity&) SK_OVERRIDE; + SkStream* openStream(const FontIdentity&) SK_OVERRIDE; // new APIs - virtual SkDataTable* getFamilyNames() SK_OVERRIDE; + SkDataTable* getFamilyNames() SK_OVERRIDE; virtual bool matchFamilySet(const char inFamilyName[], SkString* outFamilyName, SkTArray<FontIdentity>*) SK_OVERRIDE; diff --git a/src/ports/SkFontConfigTypeface.h b/src/ports/SkFontConfigTypeface.h index c7d8e26032..fcbc16f3c0 100644 --- a/src/ports/SkFontConfigTypeface.h +++ b/src/ports/SkFontConfigTypeface.h @@ -66,9 +66,9 @@ protected: SkSafeRef(localStream); } - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; - virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; + void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; private: typedef SkTypeface_FreeType INHERITED; diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index a2a139c439..459abbc9b8 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -194,14 +194,14 @@ public: } protected: - virtual unsigned generateGlyphCount() SK_OVERRIDE; - virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE; - virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE; - virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE; - virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE; - virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE; - virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; - virtual SkUnichar generateGlyphToChar(uint16_t glyph) SK_OVERRIDE; + unsigned generateGlyphCount() SK_OVERRIDE; + uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE; + void generateAdvance(SkGlyph* glyph) SK_OVERRIDE; + void generateMetrics(SkGlyph* glyph) SK_OVERRIDE; + void generateImage(const SkGlyph& glyph) SK_OVERRIDE; + void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE; + void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; + SkUnichar generateGlyphToChar(uint16_t glyph) SK_OVERRIDE; private: SkFaceRec* fFaceRec; diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h index 7bb53b8bc3..57aedd07cf 100644 --- a/src/ports/SkFontHost_FreeType_common.h +++ b/src/ports/SkFontHost_FreeType_common.h @@ -60,20 +60,20 @@ protected: virtual SkScalerContext* onCreateScalerContext( const SkDescriptor*) const SK_OVERRIDE; - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t*, uint32_t) const SK_OVERRIDE; - virtual int onGetUPEM() const SK_OVERRIDE; + int onGetUPEM() const SK_OVERRIDE; virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count, int32_t adjustments[]) const SK_OVERRIDE; virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE; - virtual int onCountGlyphs() const SK_OVERRIDE; + int onCountGlyphs() const SK_OVERRIDE; - virtual LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp index 853416c2f4..ec8e33870c 100644 --- a/src/ports/SkFontHost_linux.cpp +++ b/src/ports/SkFontHost_linux.cpp @@ -42,11 +42,11 @@ public: virtual const char* getUniqueString() const = 0; protected: - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { *familyName = fFamilyName; } - virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const SK_OVERRIDE { + void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const SK_OVERRIDE { desc->setFamilyName(fFamilyName.c_str()); desc->setFontFileName(this->getUniqueString()); desc->setFontIndex(fIndex); @@ -70,10 +70,10 @@ class SkTypeface_Empty : public SkTypeface_Custom { public: SkTypeface_Empty() : INHERITED(SkFontStyle(), false, true, SkString(), 0) {} - virtual const char* getUniqueString() const SK_OVERRIDE { return NULL; } + const char* getUniqueString() const SK_OVERRIDE { return NULL; } protected: - virtual SkStream* onOpenStream(int*) const SK_OVERRIDE { return NULL; } + SkStream* onOpenStream(int*) const SK_OVERRIDE { return NULL; } private: typedef SkTypeface_Custom INHERITED; @@ -88,10 +88,10 @@ public: , fStream(SkRef(stream)) { } - virtual const char* getUniqueString() const SK_OVERRIDE { return NULL; } + const char* getUniqueString() const SK_OVERRIDE { return NULL; } protected: - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { *ttcIndex = this->getIndex(); return fStream->duplicate(); } @@ -119,7 +119,7 @@ public: , fStream(c_CustomTypefaceRetain ? SkStream::NewFromFile(fPath.c_str()) : NULL) { } - virtual const char* getUniqueString() const SK_OVERRIDE { + const char* getUniqueString() const SK_OVERRIDE { const char* str = strrchr(fPath.c_str(), '/'); if (str) { str += 1; // skip the '/' @@ -128,7 +128,7 @@ public: } protected: - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { *ttcIndex = this->getIndex(); if (fStream.get()) { return fStream->duplicate(); @@ -155,11 +155,11 @@ class SkFontStyleSet_Custom : public SkFontStyleSet { public: explicit SkFontStyleSet_Custom(const SkString familyName) : fFamilyName(familyName) { } - virtual int count() SK_OVERRIDE { + int count() SK_OVERRIDE { return fStyles.count(); } - virtual void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { SkASSERT(index < fStyles.count()); bool bold = fStyles[index]->isBold(); bool italic = fStyles[index]->isItalic(); @@ -169,7 +169,7 @@ public: name->reset(); } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { SkASSERT(index < fStyles.count()); return SkRef(fStyles[index].get()); } @@ -182,7 +182,7 @@ public: return score; } - virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { if (0 == fStyles.count()) { return NULL; } @@ -232,21 +232,21 @@ public: } protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return fFamilies.count(); } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { SkASSERT(index < fFamilies.count()); familyName->set(fFamilies[index]->fFamilyName); } - virtual SkFontStyleSet_Custom* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet_Custom* onCreateStyleSet(int index) const SK_OVERRIDE { SkASSERT(index < fFamilies.count()); return SkRef(fFamilies[index].get()); } - virtual SkFontStyleSet_Custom* onMatchFamily(const char familyName[]) const SK_OVERRIDE { + SkFontStyleSet_Custom* onMatchFamily(const char familyName[]) const SK_OVERRIDE { for (int i = 0; i < fFamilies.count(); ++i) { if (fFamilies[i]->fFamilyName.equals(familyName)) { return SkRef(fFamilies[i].get()); @@ -282,12 +282,12 @@ protected: return NULL; } - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { SkAutoTUnref<SkStream> stream(new SkMemoryStream(data)); return this->createFromStream(stream, ttcIndex); } - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { if (NULL == stream || stream->getLength() <= 0) { SkDELETE(stream); return NULL; @@ -304,7 +304,7 @@ protected: } } - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL; } diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 8d3a6fac86..f12785d106 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -468,22 +468,22 @@ public: protected: friend class SkFontHost; // to access our protected members for deprecated methods - virtual int onGetUPEM() const SK_OVERRIDE; - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; + int onGetUPEM() const SK_OVERRIDE; + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; - virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; + void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t*, uint32_t) const SK_OVERRIDE; virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE; - virtual int onCountGlyphs() const SK_OVERRIDE; + int onCountGlyphs() const SK_OVERRIDE; private: bool fIsLocalStream; @@ -2109,11 +2109,11 @@ public: CFRelease(fFamilyName); } - virtual int count() SK_OVERRIDE { + int count() SK_OVERRIDE { return fCount; } - virtual void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { SkASSERT((unsigned)index < (unsigned)fCount); CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index); if (style) { @@ -2126,14 +2126,14 @@ public: } } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { SkASSERT((unsigned)index < (unsigned)CFArrayGetCount(fArray)); CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index); return createFromDesc(fFamilyName, desc); } - virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { if (0 == fCount) { return NULL; } @@ -2197,11 +2197,11 @@ public: } protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return fCount; } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { if ((unsigned)index < (unsigned)fCount) { CFStringToSkString(this->stringAt(index), familyName); } else { @@ -2209,14 +2209,14 @@ protected: } } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { if ((unsigned)index >= (unsigned)fCount) { return NULL; } return CreateSet(this->stringAt(index)); } - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { AutoCFRelease<CFStringRef> cfName(make_CFString(familyName)); return CreateSet(cfName); } @@ -2237,7 +2237,7 @@ protected: return NULL; } - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromData(data)); if (NULL == pr) { return NULL; @@ -2245,7 +2245,7 @@ protected: return create_from_dataProvider(pr); } - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromStream(stream)); if (NULL == pr) { return NULL; @@ -2253,7 +2253,7 @@ protected: return create_from_dataProvider(pr); } - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { AutoCFRelease<CGDataProviderRef> pr(CGDataProviderCreateWithFilename(path)); if (NULL == pr) { return NULL; diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 5ea55bd7a4..6f4a60341f 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -255,20 +255,20 @@ public: } protected: - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t*, uint32_t) const SK_OVERRIDE; - virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; + void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; virtual int onCharsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE; - virtual int onCountGlyphs() const SK_OVERRIDE; - virtual int onGetUPEM() const SK_OVERRIDE; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; + int onCountGlyphs() const SK_OVERRIDE; + int onGetUPEM() const SK_OVERRIDE; + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; }; @@ -283,7 +283,7 @@ public: } protected: - virtual void weak_dispose() const SK_OVERRIDE { + void weak_dispose() const SK_OVERRIDE { RemoveFontMemResourceEx(fFontMemResource); //SkTypefaceCache::Remove(this); INHERITED::weak_dispose(); @@ -541,13 +541,13 @@ public: bool isValid() const; protected: - virtual unsigned generateGlyphCount() SK_OVERRIDE; - virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE; - virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE; - virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE; - virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE; - virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE; - virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; + unsigned generateGlyphCount() SK_OVERRIDE; + uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE; + void generateAdvance(SkGlyph* glyph) SK_OVERRIDE; + void generateMetrics(SkGlyph* glyph) SK_OVERRIDE; + void generateImage(const SkGlyph& glyph) SK_OVERRIDE; + void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE; + void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; private: DWORD getGDIGlyphPath(const SkGlyph& glyph, UINT flags, @@ -2389,11 +2389,11 @@ public: ::DeleteDC(hdc); } - virtual int count() SK_OVERRIDE { + int count() SK_OVERRIDE { return fArray.count(); } - virtual void getStyle(int index, SkFontStyle* fs, SkString* styleName) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* fs, SkString* styleName) SK_OVERRIDE { if (fs) { *fs = get_style(fArray[index].elfLogFont); } @@ -2410,11 +2410,11 @@ public: } } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { return SkCreateTypefaceFromLOGFONT(fArray[index].elfLogFont); } - virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { // todo: return SkCreateTypefaceFromLOGFONT(fArray[0].elfLogFont); } @@ -2436,21 +2436,21 @@ public: } protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return fLogFontArray.count(); } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { SkASSERT((unsigned)index < (unsigned)fLogFontArray.count()); tchar_to_skstring(fLogFontArray[index].elfLogFont.lfFaceName, familyName); } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { SkASSERT((unsigned)index < (unsigned)fLogFontArray.count()); return SkNEW_ARGS(SkFontStyleSetGDI, (fLogFontArray[index].elfLogFont.lfFaceName)); } - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { if (NULL == familyName) { familyName = ""; // do we need this check??? } @@ -2480,17 +2480,17 @@ protected: return this->matchFamilyStyle(familyName.c_str(), fontstyle); } - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { return create_from_stream(stream); } - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { // could be in base impl SkAutoTUnref<SkStream> stream(SkNEW_ARGS(SkMemoryStream, (data))); return this->createFromStream(stream); } - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { // could be in base impl SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); return this->createFromStream(stream); diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index fb77b2764d..794790be59 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -50,7 +50,7 @@ public: , fFamilyName(familyName) { } protected: - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { *familyName = fFamilyName; } @@ -84,7 +84,7 @@ public: desc->setFontIndex(fIndex); *serialize = false; } - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { *ttcIndex = fIndex; return SkStream::NewFromFile(fPathName.c_str()); } @@ -115,7 +115,7 @@ public: *serialize = true; } - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { *ttcIndex = fIndex; return fStream->duplicate(); } @@ -191,10 +191,10 @@ public: } } - virtual int count() SK_OVERRIDE { + int count() SK_OVERRIDE { return fStyles.count(); } - virtual void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE { if (index < 0 || fStyles.count() <= index) { return; } @@ -205,7 +205,7 @@ public: name->reset(); } } - virtual SkTypeface_AndroidSystem* createTypeface(int index) SK_OVERRIDE { + SkTypeface_AndroidSystem* createTypeface(int index) SK_OVERRIDE { if (index < 0 || fStyles.count() <= index) { return NULL; } @@ -216,7 +216,7 @@ public: * TODO: consider replacing with SkStyleSet_Indirect::matchStyle(); * this simpler version using match_score() passes all our tests. */ - virtual SkTypeface_AndroidSystem* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { + SkTypeface_AndroidSystem* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE { if (0 == fStyles.count()) { return NULL; } @@ -284,11 +284,11 @@ protected: /** Returns not how many families we have, but how many unique names * exist among the families. */ - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return fNameToFamilyMap.count(); } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { if (index < 0 || fNameToFamilyMap.count() <= index) { familyName->reset(); return; @@ -296,14 +296,14 @@ protected: familyName->set(fNameToFamilyMap[index].name); } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { if (index < 0 || fNameToFamilyMap.count() <= index) { return NULL; } return SkRef(fNameToFamilyMap[index].styleSet); } - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { if (!familyName) { return NULL; } @@ -408,17 +408,17 @@ protected: return NULL; } - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { SkAutoTUnref<SkStream> stream(new SkMemoryStream(data)); return this->createFromStream(stream, ttcIndex); } - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL; } - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { bool isFixedPitch; SkFontStyle style; SkString name; diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index 7b670697fd..b5e4eaed64 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -382,16 +382,16 @@ public: , fIndex(index) { }; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { familyName->reset(); } - virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const SK_OVERRIDE { + void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const SK_OVERRIDE { desc->setFontIndex(fIndex); *serialize = true; } - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { *ttcIndex = fIndex; return fStream->duplicate(); } @@ -411,11 +411,11 @@ public: } mutable SkAutoFcPattern fPattern; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { *familyName = get_string(fPattern, FC_FAMILY); } - virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const SK_OVERRIDE { + void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const SK_OVERRIDE { FCLocker lock; desc->setFamilyName(get_string(fPattern, FC_FAMILY)); desc->setFullName(get_string(fPattern, FC_FULLNAME)); @@ -425,7 +425,7 @@ public: *serialize = false; } - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { FCLocker lock; *ttcIndex = get_int(fPattern, FC_INDEX, 0); return SkStream::NewFromFile(get_string(fPattern, FC_FILE)); @@ -469,9 +469,9 @@ class SkFontMgr_fontconfig : public SkFontMgr { fFontSet.reset(); } - virtual int count() SK_OVERRIDE { return fFontSet->nfont; } + int count() SK_OVERRIDE { return fFontSet->nfont; } - virtual void getStyle(int index, SkFontStyle* style, SkString* styleName) SK_OVERRIDE { + void getStyle(int index, SkFontStyle* style, SkString* styleName) SK_OVERRIDE { if (index < 0 || fFontSet->nfont <= index) { return; } @@ -485,14 +485,14 @@ class SkFontMgr_fontconfig : public SkFontMgr { } } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { FCLocker lock; FcPattern* match = fFontSet->fonts[index]; return fFontMgr->createTypefaceFromFcPattern(match); } - virtual SkTypeface* matchStyle(const SkFontStyle& style) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle& style) SK_OVERRIDE { FCLocker lock; SkAutoFcPattern pattern; @@ -607,15 +607,15 @@ public: } protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return fFamilyNames->count(); } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { familyName->set(fFamilyNames->atStr(index)); } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { return this->onMatchFamily(fFamilyNames->atStr(index)); } @@ -684,7 +684,7 @@ protected: return false; } - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE { FCLocker lock; SkAutoFcPattern pattern; @@ -810,7 +810,7 @@ protected: } /** @param stream does not take ownership of the reference. */ - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { const size_t length = stream->getLength(); if (length <= 0 || (1u << 30) < length) { return NULL; @@ -826,12 +826,12 @@ protected: static_cast<SkStreamAsset*>(stream))); } - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE { SkAutoTUnref<SkStreamAsset> stream(SkNEW_ARGS(SkMemoryStream, (data))); return this->createFromStream(stream, ttcIndex); } - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE { SkAutoTUnref<SkStreamAsset> stream(SkStream::NewFromFile(path)); return this->createFromStream(stream, ttcIndex); } diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index eed57c2972..e7ea980872 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -264,10 +264,10 @@ public: } protected: - virtual int onCountFamilies() const SK_OVERRIDE; - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE; - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE; - virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE; + int onCountFamilies() const SK_OVERRIDE; + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE; + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE; + SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE; virtual SkTypeface* onMatchFamilyStyle(const char familyName[], const SkFontStyle& fontstyle) const SK_OVERRIDE; virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, @@ -275,9 +275,9 @@ protected: SkUnichar character) const SK_OVERRIDE; virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontstyle) const SK_OVERRIDE; - virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE; - virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE; - virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE; + SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE; + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE; + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE; virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const SK_OVERRIDE; @@ -307,10 +307,10 @@ public: , fFontFamily(SkRefComPtr(fontFamily)) { } - virtual int count() SK_OVERRIDE; - virtual void getStyle(int index, SkFontStyle* fs, SkString* styleName) SK_OVERRIDE; - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE; - virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE; + int count() SK_OVERRIDE; + void getStyle(int index, SkFontStyle* fs, SkString* styleName) SK_OVERRIDE; + SkTypeface* createTypeface(int index) SK_OVERRIDE; + SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE; private: SkAutoTUnref<const SkFontMgr_DirectWrite> fFontMgr; diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp index 0c109a276d..80fb8a3254 100644 --- a/src/ports/SkImageDecoder_WIC.cpp +++ b/src/ports/SkImageDecoder_WIC.cpp @@ -67,7 +67,7 @@ public: bool decodeStream(SkStream* stream, SkBitmap* bm, WICModes wicMode, Format* format) const; protected: - virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE; + Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE; }; struct FormatConversion { diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp index 2f02e4bcaa..5c3205d523 100644 --- a/src/ports/SkRemotableFontMgr_win_dw.cpp +++ b/src/ports/SkRemotableFontMgr_win_dw.cpp @@ -112,7 +112,7 @@ public: memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR)); } - virtual SkDataTable* getFamilyNames() const SK_OVERRIDE { + SkDataTable* getFamilyNames() const SK_OVERRIDE { int count = fFontCollection->GetFontFamilyCount(); SkDataTableBuilder names(1024); @@ -179,7 +179,7 @@ public: return S_OK; } - virtual SkRemotableFontIdentitySet* getIndex(int familyIndex) const SK_OVERRIDE { + SkRemotableFontIdentitySet* getIndex(int familyIndex) const SK_OVERRIDE { SkTScopedComPtr<IDWriteFontFamily> fontFamily; HRNM(fFontCollection->GetFontFamily(familyIndex, &fontFamily), "Could not get requested family."); @@ -237,7 +237,7 @@ public: return S_OK; } - virtual SkRemotableFontIdentitySet* matchName(const char familyName[]) const SK_OVERRIDE { + SkRemotableFontIdentitySet* matchName(const char familyName[]) const SK_OVERRIDE { SkSMallocWCHAR dwFamilyName; if (NULL == familyName) { HR_GENERAL(getDefaultFontFamilyName(&dwFamilyName), @@ -372,11 +372,11 @@ public: } // IUnknown methods - virtual ULONG STDMETHODCALLTYPE AddRef() SK_OVERRIDE { + ULONG STDMETHODCALLTYPE AddRef() SK_OVERRIDE { return InterlockedIncrement(&fRefCount); } - virtual ULONG STDMETHODCALLTYPE Release() SK_OVERRIDE { + ULONG STDMETHODCALLTYPE Release() SK_OVERRIDE { ULONG newCount = InterlockedDecrement(&fRefCount); if (0 == newCount) { delete this; @@ -473,7 +473,7 @@ public: return fontFallbackRenderer->FallbackIdentity(); } - virtual SkStreamAsset* getData(int dataId) const SK_OVERRIDE { + SkStreamAsset* getData(int dataId) const SK_OVERRIDE { SkAutoMutexAcquire ama(fDataIdCacheMutex); if (dataId >= fDataIdCache.count()) { return NULL; diff --git a/src/ports/SkScalerContext_win_dw.h b/src/ports/SkScalerContext_win_dw.h index 0bd79e7d82..12ca5d5c6b 100644 --- a/src/ports/SkScalerContext_win_dw.h +++ b/src/ports/SkScalerContext_win_dw.h @@ -24,13 +24,13 @@ public: virtual ~SkScalerContext_DW(); protected: - virtual unsigned generateGlyphCount() SK_OVERRIDE; - virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE; - virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE; - virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE; - virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE; - virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE; - virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; + unsigned generateGlyphCount() SK_OVERRIDE; + uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE; + void generateAdvance(SkGlyph* glyph) SK_OVERRIDE; + void generateMetrics(SkGlyph* glyph) SK_OVERRIDE; + void generateImage(const SkGlyph& glyph) SK_OVERRIDE; + void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE; + void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; private: const void* drawDWMask(const SkGlyph& glyph, diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp index 8b9ed16d1d..563a5153d6 100644 --- a/src/ports/SkTypeface_win_dw.cpp +++ b/src/ports/SkTypeface_win_dw.cpp @@ -137,7 +137,7 @@ public: : fIndex(0), fStrings(strings) { } - virtual bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE { + bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE { if (fIndex >= fStrings->GetCount()) { return false; } diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h index 7d72dfd4d6..f25d709cb8 100644 --- a/src/ports/SkTypeface_win_dw.h +++ b/src/ports/SkTypeface_win_dw.h @@ -84,7 +84,7 @@ public: } protected: - virtual void weak_dispose() const SK_OVERRIDE { + void weak_dispose() const SK_OVERRIDE { if (fDWriteFontCollectionLoader.get()) { HRV(fFactory->UnregisterFontCollectionLoader(fDWriteFontCollectionLoader.get())); } @@ -96,20 +96,20 @@ protected: INHERITED::weak_dispose(); } - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t*, uint32_t) const SK_OVERRIDE; - virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; + void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE; virtual int onCharsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE; - virtual int onCountGlyphs() const SK_OVERRIDE; - virtual int onGetUPEM() const SK_OVERRIDE; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; + int onCountGlyphs() const SK_OVERRIDE; + int onGetUPEM() const SK_OVERRIDE; + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE; + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; diff --git a/src/sfnt/SkOTUtils.h b/src/sfnt/SkOTUtils.h index 4825fbeb2f..51781b40cd 100644 --- a/src/sfnt/SkOTUtils.h +++ b/src/sfnt/SkOTUtils.h @@ -52,7 +52,7 @@ struct SkOTUtils { */ static LocalizedStrings_NameTable* CreateForFamilyNames(const SkTypeface& typeface); - virtual bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE; + bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE; private: static SkOTTableName::Record::NameID::Predefined::Value familyNameTypes[3]; @@ -70,7 +70,7 @@ struct SkOTUtils { : fName(name), fLanguage(language), fHasNext(true) { } - virtual bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE { + bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE { localizedString->fString = fName; localizedString->fLanguage = fLanguage; diff --git a/src/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h index 028e526048..27bc6bc018 100644 --- a/src/utils/SkCanvasStack.h +++ b/src/utils/SkCanvasStack.h @@ -18,7 +18,7 @@ public: virtual ~SkCanvasStack(); void pushCanvas(SkCanvas* canvas, const SkIPoint& origin); - virtual void removeAll() SK_OVERRIDE; + void removeAll() SK_OVERRIDE; /* * The following add/remove canvas methods are overrides from SkNWayCanvas @@ -26,16 +26,16 @@ public: * can share most of the other implementation of NWay we override those * methods to be no-ops. */ - virtual void addCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); } - virtual void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); } + void addCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); } + void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); } protected: - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; private: void clipToZOrderedBounds(); diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp index a6806ddc7c..0a148024db 100644 --- a/src/utils/SkCanvasStateUtils.cpp +++ b/src/utils/SkCanvasStateUtils.cpp @@ -141,15 +141,15 @@ public: bool failed() { return fFailed; } // ClipVisitor - virtual void clipRect(const SkRect& rect, SkRegion::Op op, bool antialias) SK_OVERRIDE { + void clipRect(const SkRect& rect, SkRegion::Op op, bool antialias) SK_OVERRIDE { fFailed |= antialias; } - virtual void clipRRect(const SkRRect& rrect, SkRegion::Op op, bool antialias) SK_OVERRIDE { + void clipRRect(const SkRRect& rrect, SkRegion::Op op, bool antialias) SK_OVERRIDE { fFailed |= antialias; } - virtual void clipPath(const SkPath&, SkRegion::Op, bool antialias) SK_OVERRIDE { + void clipPath(const SkPath&, SkRegion::Op, bool antialias) SK_OVERRIDE { fFailed |= antialias; } diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index a41b3ab3b4..7da8532716 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -65,8 +65,8 @@ public: DeferredPipeController(); void setPlaybackCanvas(SkCanvas*); virtual ~DeferredPipeController(); - virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; - virtual void notifyWritten(size_t bytes) SK_OVERRIDE; + void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE; + void notifyWritten(size_t bytes) SK_OVERRIDE; void playback(bool silent); bool hasPendingCommands() const { return fAllocator.blockCount() != 0; } size_t storageAllocatedForRecording() const { return fAllocator.totalCapacity(); } @@ -158,22 +158,22 @@ public: void recordedDrawCommand(); void setIsDrawingToLayer(bool value) {fIsDrawingToLayer = value;} - virtual SkImageInfo imageInfo() const SK_OVERRIDE; + SkImageInfo imageInfo() const SK_OVERRIDE; - virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE; + GrRenderTarget* accessRenderTarget() SK_OVERRIDE; - virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; - virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; + SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; protected: - virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE; - virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE; - virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y) SK_OVERRIDE; + const SkBitmap& onAccessBitmap() SK_OVERRIDE; + bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE; + bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y) SK_OVERRIDE; // None of the following drawing methods should ever get called on the // deferred device - virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE + void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE {SkASSERT(0);} virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], @@ -182,7 +182,7 @@ protected: virtual void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) SK_OVERRIDE {SkASSERT(0);} - virtual void drawOval(const SkDraw&, const SkRect&, const SkPaint&) SK_OVERRIDE + void drawOval(const SkDraw&, const SkRect&, const SkPaint&) SK_OVERRIDE {SkASSERT(0);} virtual void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) SK_OVERRIDE @@ -228,13 +228,13 @@ protected: const SkPaint&) SK_OVERRIDE {SkASSERT(0);} - virtual void lockPixels() SK_OVERRIDE {} - virtual void unlockPixels() SK_OVERRIDE {} + void lockPixels() SK_OVERRIDE {} + void unlockPixels() SK_OVERRIDE {} - virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { + bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } - virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { + bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } virtual bool filterImage(const SkImageFilter*, const SkBitmap&, @@ -243,8 +243,8 @@ protected: } private: - virtual void flush() SK_OVERRIDE; - virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {} + void flush() SK_OVERRIDE; + void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {} void beginRecording(); void init(); diff --git a/src/utils/SkEventTracer.cpp b/src/utils/SkEventTracer.cpp index 694becf518..4c0470b389 100644 --- a/src/utils/SkEventTracer.cpp +++ b/src/utils/SkEventTracer.cpp @@ -25,7 +25,7 @@ class SkDefaultEventTracer: public SkEventTracer { const char* name, SkEventTracer::Handle handle) SK_OVERRIDE {}; - virtual const uint8_t* getCategoryGroupEnabled(const char* name) SK_OVERRIDE { + const uint8_t* getCategoryGroupEnabled(const char* name) SK_OVERRIDE { static uint8_t no = 0; return &no; }; diff --git a/src/utils/SkFrontBufferedStream.cpp b/src/utils/SkFrontBufferedStream.cpp index 0922960851..ad5ae6e4af 100644 --- a/src/utils/SkFrontBufferedStream.cpp +++ b/src/utils/SkFrontBufferedStream.cpp @@ -14,21 +14,21 @@ public: // Called by Create. FrontBufferedStream(SkStream*, size_t bufferSize); - virtual size_t read(void* buffer, size_t size) SK_OVERRIDE; + size_t read(void* buffer, size_t size) SK_OVERRIDE; - virtual bool isAtEnd() const SK_OVERRIDE; + bool isAtEnd() const SK_OVERRIDE; - virtual bool rewind() SK_OVERRIDE; + bool rewind() SK_OVERRIDE; - virtual bool hasPosition() const SK_OVERRIDE { return true; } + bool hasPosition() const SK_OVERRIDE { return true; } - virtual size_t getPosition() const SK_OVERRIDE { return fOffset; } + size_t getPosition() const SK_OVERRIDE { return fOffset; } - virtual bool hasLength() const SK_OVERRIDE { return fHasLength; } + bool hasLength() const SK_OVERRIDE { return fHasLength; } - virtual size_t getLength() const SK_OVERRIDE { return fLength; } + size_t getLength() const SK_OVERRIDE { return fLength; } - virtual SkStreamRewindable* duplicate() const SK_OVERRIDE { return NULL; } + SkStreamRewindable* duplicate() const SK_OVERRIDE { return NULL; } private: SkAutoTUnref<SkStream> fStream; diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h index 9589c3ea38..6f1e1b5e46 100644 --- a/src/utils/SkGatherPixelRefsAndRects.h +++ b/src/utils/SkGatherPixelRefsAndRects.h @@ -35,12 +35,12 @@ public: SkSafeUnref(fPRCont); } - virtual SkImageInfo imageInfo() const SK_OVERRIDE { + SkImageInfo imageInfo() const SK_OVERRIDE { return fEmptyBitmap.info(); } protected: - virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) SK_OVERRIDE { + void drawPaint(const SkDraw& draw, const SkPaint& paint) SK_OVERRIDE { SkBitmap bm; if (GetBitmapFromPaint(paint, &bm)) { @@ -268,13 +268,13 @@ protected: NothingToDo(); } // TODO: allow this call to return failure, or move to SkBitmapDevice only. - virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE { + const SkBitmap& onAccessBitmap() SK_OVERRIDE { return fEmptyBitmap; } - virtual void lockPixels() SK_OVERRIDE { NothingToDo(); } - virtual void unlockPixels() SK_OVERRIDE { NothingToDo(); } - virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } - virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } + void lockPixels() SK_OVERRIDE { NothingToDo(); } + void unlockPixels() SK_OVERRIDE { NothingToDo(); } + bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } + bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE { return false; @@ -296,11 +296,11 @@ private: return false; } - virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE { + void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE { NotSupported(); } - virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& info) SK_OVERRIDE { + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& info) SK_OVERRIDE { // we expect to only get called via savelayer, in which case it is fine. SkASSERT(kSaveLayer_Usage == info.fUsage); return SkNEW_ARGS(SkGatherPixelRefsAndRectsDevice, diff --git a/src/utils/SkMD5.h b/src/utils/SkMD5.h index 4f504782b6..889338bec0 100644 --- a/src/utils/SkMD5.h +++ b/src/utils/SkMD5.h @@ -24,12 +24,12 @@ public: /** Processes input, adding it to the digest. * Note that this treats the buffer as a series of uint8_t values. */ - virtual bool write(const void* buffer, size_t size) SK_OVERRIDE { + bool write(const void* buffer, size_t size) SK_OVERRIDE { this->update(reinterpret_cast<const uint8_t*>(buffer), size); return true; } - virtual size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); } + size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); } /** Processes input, adding it to the digest. Calling this after finish is undefined. */ void update(const uint8_t* input, size_t length); diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp index 2c6b8f56b5..dadd89a665 100644 --- a/src/utils/SkPictureUtils.cpp +++ b/src/utils/SkPictureUtils.cpp @@ -60,24 +60,24 @@ public: fPRSet = prset; } - virtual SkImageInfo imageInfo() const SK_OVERRIDE { + SkImageInfo imageInfo() const SK_OVERRIDE { return SkImageInfo::MakeUnknown(fSize.width(), fSize.height()); } - virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; } + GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; } // TODO: allow this call to return failure, or move to SkBitmapDevice only. - virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE { + const SkBitmap& onAccessBitmap() SK_OVERRIDE { return fEmptyBitmap; } - virtual void lockPixels() SK_OVERRIDE { nothing_to_do(); } - virtual void unlockPixels() SK_OVERRIDE { nothing_to_do(); } - virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } - virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } + void lockPixels() SK_OVERRIDE { nothing_to_do(); } + void unlockPixels() SK_OVERRIDE { nothing_to_do(); } + bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } + bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; } virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE { return false; } - virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE { + void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE { this->addBitmapFromPaint(paint); } virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, @@ -149,15 +149,15 @@ public: } protected: - virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE { + void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE { not_supported(); } - virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& cinfo) SK_OVERRIDE { + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& cinfo) SK_OVERRIDE { // we expect to only get called via savelayer, in which case it is fine. SkASSERT(kSaveLayer_Usage == cinfo.fUsage); return SkNEW_ARGS(GatherPixelRefDevice, (cinfo.fInfo.width(), cinfo.fInfo.height(), fPRSet)); } - virtual void flush() SK_OVERRIDE {} + void flush() SK_OVERRIDE {} private: PixelRefSet* fPRSet; diff --git a/src/utils/SkSHA1.h b/src/utils/SkSHA1.h index df8b9bf1b6..e7ede64640 100644 --- a/src/utils/SkSHA1.h +++ b/src/utils/SkSHA1.h @@ -24,12 +24,12 @@ public: /** Processes input, adding it to the digest. * Note that this treats the buffer as a series of uint8_t values. */ - virtual bool write(const void* buffer, size_t size) SK_OVERRIDE { + bool write(const void* buffer, size_t size) SK_OVERRIDE { update(reinterpret_cast<const uint8_t*>(buffer), size); return true; } - virtual size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); } + size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); } /** Processes input, adding it to the digest. Calling this after finish is undefined. */ void update(const uint8_t* input, size_t length); diff --git a/src/utils/SkTextureCompressor_Blitter.h b/src/utils/SkTextureCompressor_Blitter.h index cdf2fb680d..186df530c3 100644 --- a/src/utils/SkTextureCompressor_Blitter.h +++ b/src/utils/SkTextureCompressor_Blitter.h @@ -85,7 +85,7 @@ public: virtual ~SkTCompressedAlphaBlitter() { this->flushRuns(); } // Blit a horizontal run of one or more pixels. - virtual void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) SK_OVERRIDE { // This function is intended to be called from any standard RGB // buffer, so we should never encounter it. However, if some code // path does end up here, then this needs to be investigated. @@ -141,7 +141,7 @@ public: } // Blit a vertical run of pixels with a constant alpha value. - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { // This function is currently not implemented. It is not explicitly // required by the contract, but if at some time a code path runs into // this function (which is entirely possible), it needs to be implemented. @@ -163,7 +163,7 @@ public: #ifdef SK_DEBUG bool fCalledOnceWithNonzeroY; #endif - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { // Assumptions: SkASSERT(0 == x); @@ -306,7 +306,7 @@ public: #ifdef SK_DEBUG bool fBlitMaskCalled; #endif - virtual void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE { + void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE { // Assumptions: SkASSERT(!fBlitMaskCalled); @@ -368,7 +368,7 @@ public: // If the blitter just sets a single value for each pixel, return the // bitmap it draws into, and assign value. If not, return NULL and ignore // the value parameter. - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE { + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE { return NULL; } @@ -378,7 +378,7 @@ public: * to preserve semantics if blitAntiH doesn't get called in too many * weird ways... */ - virtual int requestRowsPreserved() const SK_OVERRIDE { return BlockDim; } + int requestRowsPreserved() const SK_OVERRIDE { return BlockDim; } private: static const int kPixelsPerBlock = BlockDim * BlockDim; diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index d7704071d7..6a04006264 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -95,7 +95,7 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index) { class OverdrawXfermode : public SkXfermode { public: - virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE { + SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE { // This table encodes the color progression of the overdraw visualization static const SkPMColor gTable[] = { SkPackARGB32(0x00, 0x00, 0x00, 0x00), @@ -120,7 +120,7 @@ public: return gTable[SK_ARRAY_COUNT(gTable)-1]; } - virtual Factory getFactory() const SK_OVERRIDE { return NULL; } + Factory getFactory() const SK_OVERRIDE { return NULL; } #ifndef SK_IGNORE_TO_STRING virtual void toString(SkString* str) const { str->set("OverdrawXfermode"); } #endif @@ -136,7 +136,7 @@ public: delete fXferMode; } - virtual bool filter(SkPaint* p, Type) SK_OVERRIDE { + bool filter(SkPaint* p, Type) SK_OVERRIDE { p->setXfermode(fXferMode); return true; } @@ -159,7 +159,7 @@ public: fFilterLevel = filterLevel; } - virtual bool filter(SkPaint* p, Type) SK_OVERRIDE { + bool filter(SkPaint* p, Type) SK_OVERRIDE { p->setFilterLevel(fFilterLevel); return true; } @@ -175,21 +175,21 @@ class SkDebugClipVisitor : public SkCanvas::ClipVisitor { public: SkDebugClipVisitor(SkCanvas* canvas) : fCanvas(canvas) {} - virtual void clipRect(const SkRect& r, SkRegion::Op, bool doAA) SK_OVERRIDE { + void clipRect(const SkRect& r, SkRegion::Op, bool doAA) SK_OVERRIDE { SkPaint p; p.setColor(SK_ColorRED); p.setStyle(SkPaint::kStroke_Style); p.setAntiAlias(doAA); fCanvas->drawRect(r, p); } - virtual void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) SK_OVERRIDE { + void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) SK_OVERRIDE { SkPaint p; p.setColor(SK_ColorGREEN); p.setStyle(SkPaint::kStroke_Style); p.setAntiAlias(doAA); fCanvas->drawRRect(rr, p); } - virtual void clipPath(const SkPath& path, SkRegion::Op, bool doAA) SK_OVERRIDE { + void clipPath(const SkPath& path, SkRegion::Op, bool doAA) SK_OVERRIDE { SkPaint p; p.setColor(SK_ColorBLUE); p.setStyle(SkPaint::kStroke_Style); diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index 4acf8322b9..3d9983b504 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -146,16 +146,16 @@ public: // Inherited from SkCanvas //////////////////////////////////////////////////////////////////////////////// - virtual void beginCommentGroup(const char* description) SK_OVERRIDE; - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; - virtual void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) SK_OVERRIDE; + void addComment(const char* kywd, const char* value) SK_OVERRIDE; + void endCommentGroup() SK_OVERRIDE; static const int kVizImageHeight = 256; static const int kVizImageWidth = 256; - virtual bool isClipEmpty() const SK_OVERRIDE { return false; } - virtual bool isClipRect() const SK_OVERRIDE { return true; } - virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { + bool isClipEmpty() const SK_OVERRIDE { return false; } + bool isClipRect() const SK_OVERRIDE { return true; } + bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { if (bounds) { bounds->setXYWH(0, 0, SkIntToScalar(this->imageInfo().width()), @@ -163,7 +163,7 @@ public: } return true; } - virtual bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE { + bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE { if (bounds) { bounds->setLargest(); } @@ -171,14 +171,14 @@ public: } protected: - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], @@ -211,12 +211,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion& region, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion& region, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; void markActiveCommands(int index); diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h index 831dffcfa0..22ee700dd7 100644 --- a/src/utils/debugger/SkDrawCommand.h +++ b/src/utils/debugger/SkDrawCommand.h @@ -79,9 +79,9 @@ private: class SkRestoreCommand : public SkDrawCommand { public: SkRestoreCommand(); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual void trackSaveState(int* state) SK_OVERRIDE; - virtual Action action() const SK_OVERRIDE { return kPopLayer_Action; } + void execute(SkCanvas* canvas) const SK_OVERRIDE; + void trackSaveState(int* state) SK_OVERRIDE; + Action action() const SK_OVERRIDE { return kPopLayer_Action; } private: typedef SkDrawCommand INHERITED; @@ -90,7 +90,7 @@ private: class SkClearCommand : public SkDrawCommand { public: SkClearCommand(SkColor color); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkColor fColor; @@ -100,8 +100,8 @@ private: class SkClipPathCommand : public SkDrawCommand { public: SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool doAA); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkPath fPath; SkRegion::Op fOp; @@ -113,7 +113,7 @@ private: class SkClipRegionCommand : public SkDrawCommand { public: SkClipRegionCommand(const SkRegion& region, SkRegion::Op op); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkRegion fRegion; SkRegion::Op fOp; @@ -124,7 +124,7 @@ private: class SkClipRectCommand : public SkDrawCommand { public: SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; const SkRect& rect() const { return fRect; } SkRegion::Op op() const { return fOp; } @@ -141,8 +141,8 @@ private: class SkClipRRectCommand : public SkDrawCommand { public: SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; const SkRRect& rrect() const { return fRRect; } SkRegion::Op op() const { return fOp; } @@ -159,7 +159,7 @@ private: class SkConcatCommand : public SkDrawCommand { public: SkConcatCommand(const SkMatrix& matrix); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkMatrix fMatrix; @@ -170,8 +170,8 @@ class SkDrawBitmapCommand : public SkDrawCommand { public: SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top, const SkPaint* paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkBitmap fBitmap; SkScalar fLeft; @@ -186,8 +186,8 @@ class SkDrawBitmapNineCommand : public SkDrawCommand { public: SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, const SkPaint* paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkBitmap fBitmap; SkIRect fCenter; @@ -203,8 +203,8 @@ public: SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint, SkCanvas::DrawBitmapRectFlags flags); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; const SkBitmap& bitmap() const { return fBitmap; } @@ -240,7 +240,7 @@ private: class SkBeginCommentGroupCommand : public SkDrawCommand { public: SkBeginCommentGroupCommand(const char* description); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE { + void execute(SkCanvas* canvas) const SK_OVERRIDE { canvas->beginCommentGroup(fDescription.c_str()); }; private: @@ -252,7 +252,7 @@ private: class SkCommentCommand : public SkDrawCommand { public: SkCommentCommand(const char* kywd, const char* value); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE { + void execute(SkCanvas* canvas) const SK_OVERRIDE { canvas->addComment(fKywd.c_str(), fValue.c_str()); }; private: @@ -265,7 +265,7 @@ private: class SkEndCommentGroupCommand : public SkDrawCommand { public: SkEndCommentGroupCommand(); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE { + void execute(SkCanvas* canvas) const SK_OVERRIDE { canvas->endCommentGroup(); }; private: @@ -275,8 +275,8 @@ private: class SkDrawOvalCommand : public SkDrawCommand { public: SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkRect fOval; SkPaint fPaint; @@ -287,8 +287,8 @@ private: class SkDrawPaintCommand : public SkDrawCommand { public: SkDrawPaintCommand(const SkPaint& paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkPaint fPaint; @@ -298,8 +298,8 @@ private: class SkDrawPathCommand : public SkDrawCommand { public: SkDrawPathCommand(const SkPath& path, const SkPaint& paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkPath fPath; @@ -311,8 +311,8 @@ private: class SkDrawPictureCommand : public SkDrawCommand { public: SkDrawPictureCommand(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkAutoTUnref<const SkPicture> fPicture; @@ -329,8 +329,8 @@ public: SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint); virtual ~SkDrawPointsCommand() { delete [] fPts; } - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkCanvas::PointMode fMode; size_t fCount; @@ -345,7 +345,7 @@ public: SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint& paint); virtual ~SkDrawTextCommand() { delete [] fText; } - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: char* fText; size_t fByteLength; @@ -361,7 +361,7 @@ public: SkDrawPosTextCommand(const void* text, size_t byteLength, const SkPoint pos[], const SkPaint& paint); virtual ~SkDrawPosTextCommand() { delete [] fPos; delete [] fText; } - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: char* fText; size_t fByteLength; @@ -376,7 +376,7 @@ public: SkDrawTextOnPathCommand(const void* text, size_t byteLength, const SkPath& path, const SkMatrix* matrix, const SkPaint& paint); virtual ~SkDrawTextOnPathCommand() { delete [] fText; } - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: char* fText; size_t fByteLength; @@ -392,7 +392,7 @@ public: SkDrawPosTextHCommand(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY, const SkPaint& paint); virtual ~SkDrawPosTextHCommand() { delete [] fXpos; delete [] fText; } - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkScalar* fXpos; char* fText; @@ -407,8 +407,8 @@ class SkDrawTextBlobCommand : public SkDrawCommand { public: SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkAutoTUnref<const SkTextBlob> fBlob; @@ -422,7 +422,7 @@ private: class SkDrawRectCommand : public SkDrawCommand { public: SkDrawRectCommand(const SkRect& rect, const SkPaint& paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; const SkRect& rect() const { return fRect; } const SkPaint& paint() const { return fPaint; } @@ -436,8 +436,8 @@ private: class SkDrawRRectCommand : public SkDrawCommand { public: SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkRRect fRRect; SkPaint fPaint; @@ -449,8 +449,8 @@ class SkDrawDRRectCommand : public SkDrawCommand { public: SkDrawDRRectCommand(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkRRect fOuter; SkRRect fInner; @@ -462,8 +462,8 @@ private: class SkDrawSpriteCommand : public SkDrawCommand { public: SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int top, const SkPaint* paint); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual bool render(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; + bool render(SkCanvas* canvas) const SK_OVERRIDE; private: SkBitmap fBitmap; int fLeft; @@ -482,7 +482,7 @@ public: const uint16_t indices[], int indexCount, const SkPaint& paint); virtual ~SkDrawVerticesCommand(); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkCanvas::VertexMode fVmode; int fVertexCount; @@ -500,7 +500,7 @@ private: class SkRotateCommand : public SkDrawCommand { public: SkRotateCommand(SkScalar degrees); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkScalar fDegrees; @@ -510,9 +510,9 @@ private: class SkSaveCommand : public SkDrawCommand { public: SkSaveCommand(); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual void trackSaveState(int* state) SK_OVERRIDE; - virtual Action action() const SK_OVERRIDE { return kPushLayer_Action; } + void execute(SkCanvas* canvas) const SK_OVERRIDE; + void trackSaveState(int* state) SK_OVERRIDE; + Action action() const SK_OVERRIDE { return kPushLayer_Action; } private: typedef SkDrawCommand INHERITED; }; @@ -521,12 +521,12 @@ class SkSaveLayerCommand : public SkDrawCommand { public: SkSaveLayerCommand(const SkRect* bounds, const SkPaint* paint, SkCanvas::SaveFlags flags); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; - virtual void vizExecute(SkCanvas* canvas) const SK_OVERRIDE; - virtual void trackSaveState(int* state) SK_OVERRIDE; - virtual Action action() const SK_OVERRIDE{ return kPushLayer_Action; } - virtual void setActive(bool active) SK_OVERRIDE { fActive = active; } - virtual bool active() const SK_OVERRIDE { return fActive; } + void execute(SkCanvas* canvas) const SK_OVERRIDE; + void vizExecute(SkCanvas* canvas) const SK_OVERRIDE; + void trackSaveState(int* state) SK_OVERRIDE; + Action action() const SK_OVERRIDE{ return kPushLayer_Action; } + void setActive(bool active) SK_OVERRIDE { fActive = active; } + bool active() const SK_OVERRIDE { return fActive; } const SkPaint* paint() const { return fPaintPtr; } @@ -544,7 +544,7 @@ private: class SkScaleCommand : public SkDrawCommand { public: SkScaleCommand(SkScalar sx, SkScalar sy); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; SkScalar x() const { return fSx; } SkScalar y() const { return fSy; } @@ -559,8 +559,8 @@ private: class SkSetMatrixCommand : public SkDrawCommand { public: SkSetMatrixCommand(const SkMatrix& matrix); - virtual void setUserMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void setUserMatrix(const SkMatrix&) SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkMatrix fUserMatrix; SkMatrix fMatrix; @@ -571,7 +571,7 @@ private: class SkSkewCommand : public SkDrawCommand { public: SkSkewCommand(SkScalar sx, SkScalar sy); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; private: SkScalar fSx; SkScalar fSy; @@ -582,7 +582,7 @@ private: class SkTranslateCommand : public SkDrawCommand { public: SkTranslateCommand(SkScalar dx, SkScalar dy); - virtual void execute(SkCanvas* canvas) const SK_OVERRIDE; + void execute(SkCanvas* canvas) const SK_OVERRIDE; SkScalar x() const { return fDx; } SkScalar y() const { return fDy; } diff --git a/src/utils/win/SkDWriteFontFileStream.h b/src/utils/win/SkDWriteFontFileStream.h index ac98be6142..1800e2feca 100644 --- a/src/utils/win/SkDWriteFontFileStream.h +++ b/src/utils/win/SkDWriteFontFileStream.h @@ -24,16 +24,16 @@ public: explicit SkDWriteFontFileStream(IDWriteFontFileStream* fontFileStream); virtual ~SkDWriteFontFileStream(); - virtual size_t read(void* buffer, size_t size) SK_OVERRIDE; - virtual bool isAtEnd() const SK_OVERRIDE; - virtual bool rewind() SK_OVERRIDE; - virtual SkDWriteFontFileStream* duplicate() const SK_OVERRIDE; - virtual size_t getPosition() const SK_OVERRIDE; - virtual bool seek(size_t position) SK_OVERRIDE; - virtual bool move(long offset) SK_OVERRIDE; - virtual SkDWriteFontFileStream* fork() const SK_OVERRIDE; - virtual size_t getLength() const SK_OVERRIDE; - virtual const void* getMemoryBase() SK_OVERRIDE; + size_t read(void* buffer, size_t size) SK_OVERRIDE; + bool isAtEnd() const SK_OVERRIDE; + bool rewind() SK_OVERRIDE; + SkDWriteFontFileStream* duplicate() const SK_OVERRIDE; + size_t getPosition() const SK_OVERRIDE; + bool seek(size_t position) SK_OVERRIDE; + bool move(long offset) SK_OVERRIDE; + SkDWriteFontFileStream* fork() const SK_OVERRIDE; + size_t getLength() const SK_OVERRIDE; + const void* getMemoryBase() SK_OVERRIDE; private: SkTScopedComPtr<IDWriteFontFileStream> fFontFileStream; diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h index 99a3262718..703ac3d439 100644 --- a/src/utils/win/SkDWriteGeometrySink.h +++ b/src/utils/win/SkDWriteGeometrySink.h @@ -28,17 +28,17 @@ protected: virtual ~SkDWriteGeometrySink(); public: - virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object) SK_OVERRIDE; - virtual ULONG STDMETHODCALLTYPE AddRef(void) SK_OVERRIDE; - virtual ULONG STDMETHODCALLTYPE Release(void) SK_OVERRIDE; - - virtual void STDMETHODCALLTYPE SetFillMode(D2D1_FILL_MODE fillMode) SK_OVERRIDE; - virtual void STDMETHODCALLTYPE SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) SK_OVERRIDE; - virtual void STDMETHODCALLTYPE BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) SK_OVERRIDE; - virtual void STDMETHODCALLTYPE AddLines(const D2D1_POINT_2F *points, UINT pointsCount) SK_OVERRIDE; - virtual void STDMETHODCALLTYPE AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) SK_OVERRIDE; - virtual void STDMETHODCALLTYPE EndFigure(D2D1_FIGURE_END figureEnd) SK_OVERRIDE; - virtual HRESULT STDMETHODCALLTYPE Close() SK_OVERRIDE; + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object) SK_OVERRIDE; + ULONG STDMETHODCALLTYPE AddRef(void) SK_OVERRIDE; + ULONG STDMETHODCALLTYPE Release(void) SK_OVERRIDE; + + void STDMETHODCALLTYPE SetFillMode(D2D1_FILL_MODE fillMode) SK_OVERRIDE; + void STDMETHODCALLTYPE SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) SK_OVERRIDE; + void STDMETHODCALLTYPE BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) SK_OVERRIDE; + void STDMETHODCALLTYPE AddLines(const D2D1_POINT_2F *points, UINT pointsCount) SK_OVERRIDE; + void STDMETHODCALLTYPE AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) SK_OVERRIDE; + void STDMETHODCALLTYPE EndFigure(D2D1_FIGURE_END figureEnd) SK_OVERRIDE; + HRESULT STDMETHODCALLTYPE Close() SK_OVERRIDE; static HRESULT Create(SkPath* path, IDWriteGeometrySink** geometryToPath); }; diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp index c7d097278b..21ce2f39e8 100644 --- a/tests/BitmapHeapTest.cpp +++ b/tests/BitmapHeapTest.cpp @@ -18,11 +18,11 @@ struct SimpleFlatController : public SkFlatController { SimpleFlatController() : SkFlatController() {} ~SimpleFlatController() { fAllocations.freeAll(); } - virtual void* allocThrow(size_t bytes) SK_OVERRIDE { + void* allocThrow(size_t bytes) SK_OVERRIDE { fAllocations.push(sk_malloc_throw(bytes)); return fAllocations.top(); } - virtual void unalloc(void*) SK_OVERRIDE { } + void unalloc(void*) SK_OVERRIDE { } void setBitmapStorage(SkBitmapHeap* h) { this->setBitmapHeap(h); } private: SkTDArray<void*> fAllocations; diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp index 48100e714b..e8fea2fdf2 100644 --- a/tests/CachedDecodingPixelRefTest.cpp +++ b/tests/CachedDecodingPixelRefTest.cpp @@ -178,7 +178,7 @@ public: virtual ~TestImageGenerator() { } protected: - virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { + bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { REPORTER_ASSERT(fReporter, info); if ((NULL == info) || (kFailGetInfo_TestType == fType)) { return false; diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp index 8364a4b414..8f77fb4d49 100644 --- a/tests/CanvasStateTest.cpp +++ b/tests/CanvasStateTest.cpp @@ -254,7 +254,7 @@ DEF_TEST(CanvasState_test_complex_clips, reporter) { class TestDrawFilter : public SkDrawFilter { public: - virtual bool filter(SkPaint*, Type) SK_OVERRIDE { return true; } + bool filter(SkPaint*, Type) SK_OVERRIDE { return true; } }; DEF_TEST(CanvasState_test_draw_filters, reporter) { diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index b55f833a52..e95c4ace81 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -192,13 +192,13 @@ class Canvas2CanvasClipVisitor : public SkCanvas::ClipVisitor { public: Canvas2CanvasClipVisitor(SkCanvas* target) : fTarget(target) {} - virtual void clipRect(const SkRect& r, SkRegion::Op op, bool aa) SK_OVERRIDE { + void clipRect(const SkRect& r, SkRegion::Op op, bool aa) SK_OVERRIDE { fTarget->clipRect(r, op, aa); } - virtual void clipRRect(const SkRRect& r, SkRegion::Op op, bool aa) SK_OVERRIDE { + void clipRRect(const SkRRect& r, SkRegion::Op op, bool aa) SK_OVERRIDE { fTarget->clipRRect(r, op, aa); } - virtual void clipPath(const SkPath& p, SkRegion::Op op, bool aa) SK_OVERRIDE { + void clipPath(const SkPath& p, SkRegion::Op op, bool aa) SK_OVERRIDE { fTarget->clipPath(p, op, aa); } diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp index 1c1970a03f..4ec67ae1ba 100644 --- a/tests/DeferredCanvasTest.cpp +++ b/tests/DeferredCanvasTest.cpp @@ -56,19 +56,19 @@ public: fBitmap.allocN32Pixels(width, height); } - virtual SkCanvas* onNewCanvas() SK_OVERRIDE { + SkCanvas* onNewCanvas() SK_OVERRIDE { return SkNEW_ARGS(SkCanvas, (fBitmap)); } - virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE { + SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE { return NULL; } - virtual SkImage* onNewImageSnapshot() SK_OVERRIDE { + SkImage* onNewImageSnapshot() SK_OVERRIDE { return SkNewImageFromBitmap(fBitmap, true, &this->props()); } - virtual void onCopyOnWrite(ContentChangeMode mode) SK_OVERRIDE { + void onCopyOnWrite(ContentChangeMode mode) SK_OVERRIDE { if (mode == SkSurface::kDiscard_ContentChangeMode) { fDiscardCount++; } else { @@ -426,16 +426,16 @@ public: fFlushedDrawCommandsCount = fSkippedPendingDrawCommandsCount = 0; } - virtual void prepareForDraw() SK_OVERRIDE { + void prepareForDraw() SK_OVERRIDE { fPrepareForDrawCount++; } - virtual void storageAllocatedForRecordingChanged(size_t) SK_OVERRIDE { + void storageAllocatedForRecordingChanged(size_t) SK_OVERRIDE { fStorageAllocatedChangedCount++; } - virtual void flushedDrawCommands() SK_OVERRIDE { + void flushedDrawCommands() SK_OVERRIDE { fFlushedDrawCommandsCount++; } - virtual void skippedPendingDrawCommands() SK_OVERRIDE { + void skippedPendingDrawCommands() SK_OVERRIDE { fSkippedPendingDrawCommandsCount++; } diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index c1e34a2612..1ecc590e53 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -24,7 +24,7 @@ public: virtual ~FailureImageGenerator() { } protected: - virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { + bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { *info = SkImageInfo::MakeN32Premul(100, 100); return true; } diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp index e8c2c6a678..167d1a20e8 100644 --- a/tests/FrontBufferedStreamTest.cpp +++ b/tests/FrontBufferedStreamTest.cpp @@ -172,19 +172,19 @@ public: , fHasPosition(hasPosition) {} - virtual bool hasLength() const SK_OVERRIDE { + bool hasLength() const SK_OVERRIDE { return fHasLength; } - virtual bool hasPosition() const SK_OVERRIDE { + bool hasPosition() const SK_OVERRIDE { return fHasPosition; } - virtual size_t read(void*, size_t) SK_OVERRIDE { + size_t read(void*, size_t) SK_OVERRIDE { return 0; } - virtual bool isAtEnd() const SK_OVERRIDE { + bool isAtEnd() const SK_OVERRIDE { return true; } @@ -261,7 +261,7 @@ public: : fAtEnd(false) , fReadAfterEnd(false) {} - virtual size_t read(void* buffer, size_t size) SK_OVERRIDE { + size_t read(void* buffer, size_t size) SK_OVERRIDE { if (fAtEnd) { fReadAfterEnd = true; } else { @@ -270,7 +270,7 @@ public: return 0; } - virtual bool isAtEnd() const SK_OVERRIDE { + bool isAtEnd() const SK_OVERRIDE { return fAtEnd; } diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 087b819fc1..3b75b0f8d2 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -60,14 +60,14 @@ public: return SkRef(gBigKeyProcessor); } - virtual const char* name() const SK_OVERRIDE { return "Big Ole Key"; } + const char* name() const SK_OVERRIDE { return "Big Ole Key"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE { GLBigKeyProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLBigKeyProcessor, (*this)); } @@ -75,8 +75,8 @@ private: BigKeyProcessor() { this->initClassID<BigKeyProcessor>(); } - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { } + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { } GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp index c34f9d97e9..a4cfa73989 100644 --- a/tests/ImageCacheTest.cpp +++ b/tests/ImageCacheTest.cpp @@ -24,8 +24,8 @@ struct TestingRec : public SkResourceCache::Rec { TestingKey fKey; intptr_t fValue; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(fValue); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(fValue); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* context) { const TestingRec& rec = static_cast<const TestingRec&>(baseRec); diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp index 528c295d93..78d6b6c35f 100644 --- a/tests/ImageDecodingTest.cpp +++ b/tests/ImageDecodingTest.cpp @@ -760,7 +760,7 @@ public: SingleAllocator(void* p, size_t s) : fPixels(p), fSize(s) { } ~SingleAllocator() {} // If the pixels in fPixels are big enough, use them. - virtual bool allocPixelRef(SkBitmap* bm, SkColorTable* ct) SK_OVERRIDE { + bool allocPixelRef(SkBitmap* bm, SkColorTable* ct) SK_OVERRIDE { SkASSERT(bm); if (bm->info().getSafeSize(bm->rowBytes()) <= fSize) { bm->setPixels(fPixels, ct); diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index add9e23bba..4ffcc11209 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -59,7 +59,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(MatrixTestImageFilter) protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeFunctionPtr(fReporter); buffer.writeMatrix(fExpectedMatrix); diff --git a/tests/LazyPtrTest.cpp b/tests/LazyPtrTest.cpp index 799f705085..8bded1e9df 100644 --- a/tests/LazyPtrTest.cpp +++ b/tests/LazyPtrTest.cpp @@ -49,7 +49,7 @@ namespace { struct Racer : public SkRunnable { Racer() : fLazy(NULL), fSeen(NULL) {} - virtual void run() SK_OVERRIDE { fSeen = fLazy->get(); } + void run() SK_OVERRIDE { fSeen = fLazy->get(); } SkLazyPtr<int>* fLazy; int* fSeen; diff --git a/tests/OnceTest.cpp b/tests/OnceTest.cpp index da901f41c4..6ab9cd27ac 100644 --- a/tests/OnceTest.cpp +++ b/tests/OnceTest.cpp @@ -39,7 +39,7 @@ public: SkOnceFlag* once; int* ptr; - virtual void run() SK_OVERRIDE { + void run() SK_OVERRIDE { SkOnce(once, add_six, ptr); } }; diff --git a/tests/PDFInvalidBitmapTest.cpp b/tests/PDFInvalidBitmapTest.cpp index 2f4753e4a4..bc7143a159 100644 --- a/tests/PDFInvalidBitmapTest.cpp +++ b/tests/PDFInvalidBitmapTest.cpp @@ -23,8 +23,8 @@ class InvalidPixelRef : public SkPixelRef { public: InvalidPixelRef(const SkImageInfo& info) : SkPixelRef(info) {} private: - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE { return false; } - virtual void onUnlockPixels() SK_OVERRIDE { + bool onNewLockPixels(LockRec*) SK_OVERRIDE { return false; } + void onUnlockPixels() SK_OVERRIDE { SkDEBUGFAIL("InvalidPixelRef can't be locked"); } }; diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp index 3f539e3843..2ff98607fb 100644 --- a/tests/PDFPrimitivesTest.cpp +++ b/tests/PDFPrimitivesTest.cpp @@ -435,7 +435,7 @@ namespace { class DummyImageFilter : public SkImageFilter { public: DummyImageFilter(bool visited = false) : SkImageFilter(0, NULL), fVisited(visited) {} - virtual ~DummyImageFilter() SK_OVERRIDE {} + ~DummyImageFilter() SK_OVERRIDE {} virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const { fVisited = true; diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp index ad0a95f22b..99a5030b56 100755 --- a/tests/PathOpsSkpClipTest.cpp +++ b/tests/PathOpsSkpClipTest.cpp @@ -253,7 +253,7 @@ struct TestRunner { class TestRunnable : public SkRunnable { public: - virtual void run() SK_OVERRIDE { + void run() SK_OVERRIDE { SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024); (*fTestFun)(&fState); } @@ -819,10 +819,10 @@ typedef SkTRegistry<Test*(*)(void*)> TestRegistry; public: \ static Test* Factory(void*) { return SkNEW(name##Class); } \ protected: \ - virtual void onGetName(SkString* name) SK_OVERRIDE { \ + void onGetName(SkString* name) SK_OVERRIDE { \ name->set(#name); \ } \ - virtual void onRun() SK_OVERRIDE { test_##name(); } \ + void onRun() SK_OVERRIDE { test_##name(); } \ }; \ static TestRegistry gReg_##name##Class(name##Class::Factory); \ static void test_##name() diff --git a/tests/PathOpsThreadedCommon.h b/tests/PathOpsThreadedCommon.h index 124921e389..e43afe1ac0 100644 --- a/tests/PathOpsThreadedCommon.h +++ b/tests/PathOpsThreadedCommon.h @@ -73,7 +73,7 @@ public: fTestFun = testFun; } - virtual void run() SK_OVERRIDE { + void run() SK_OVERRIDE { SkBitmap bitmap; fState.fBitmap = &bitmap; char pathStr[PATH_STR_SIZE]; diff --git a/tests/PictureBBHTest.cpp b/tests/PictureBBHTest.cpp index e647c77dce..771aa1261d 100644 --- a/tests/PictureBBHTest.cpp +++ b/tests/PictureBBHTest.cpp @@ -62,7 +62,7 @@ public: : PictureBBHTestBase(2, 2, 1, 1) { } virtual ~DrawEmptyPictureBBHTest() { } - virtual void doTest(SkCanvas&, SkCanvas&) SK_OVERRIDE { } + void doTest(SkCanvas&, SkCanvas&) SK_OVERRIDE { } }; // Test to verify the playback of a picture into a canvas that has @@ -73,7 +73,7 @@ public: EmptyClipPictureBBHTest() : PictureBBHTestBase(2, 2, 3, 3) { } - virtual void doTest(SkCanvas& playbackCanvas, SkCanvas& recordingCanvas) SK_OVERRIDE { + void doTest(SkCanvas& playbackCanvas, SkCanvas& recordingCanvas) SK_OVERRIDE { // intersect with out of bounds rect -> empty clip. playbackCanvas.clipRect(SkRect::MakeXYWH(SkIntToScalar(10), SkIntToScalar(10), SkIntToScalar(1), SkIntToScalar(1)), SkRegion::kIntersect_Op); diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index c2e1bb103c..d69de45fd4 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -1165,12 +1165,12 @@ public: return this->INHERITED::willSaveLayer(bounds, paint, flags); } - virtual void willSave() SK_OVERRIDE { + void willSave() SK_OVERRIDE { ++fSaveCount; this->INHERITED::willSave(); } - virtual void willRestore() SK_OVERRIDE { + void willRestore() SK_OVERRIDE { ++fRestoreCount; this->INHERITED::willRestore(); } @@ -1637,7 +1637,7 @@ public: this->INHERITED::onClipPath(path, op, edgeStyle); } - virtual void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE { + void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE { fClipCount += 1; this->INHERITED::onClipRegion(deviceRgn, op); } @@ -1866,11 +1866,11 @@ struct CountingBBH : public SkBBoxHierarchy { CountingBBH() : searchCalls(0) {} - virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE { + void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE { this->searchCalls++; } - virtual void insert(SkAutoTMalloc<SkRect>*, int) SK_OVERRIDE {} + void insert(SkAutoTMalloc<SkRect>*, int) SK_OVERRIDE {} virtual size_t bytesUsed() const { return 0; } }; diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp index d1d3026f8d..b9a28244ec 100644 --- a/tests/PixelRefTest.cpp +++ b/tests/PixelRefTest.cpp @@ -6,7 +6,7 @@ class TestListener : public SkPixelRef::GenIDChangeListener { public: explicit TestListener(int* ptr) : fPtr(ptr) {} - virtual void onChange() SK_OVERRIDE { (*fPtr)++; } + void onChange() SK_OVERRIDE { (*fPtr)++; } private: int* fPtr; }; diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp index 77bcd3c9b1..cefde12354 100644 --- a/tests/QuickRejectTest.cpp +++ b/tests/QuickRejectTest.cpp @@ -16,14 +16,14 @@ class TestLooper : public SkDrawLooper { public: - virtual SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE { + SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE { return SkNEW_PLACEMENT(storage, TestDrawLooperContext); } - virtual size_t contextSize() const SK_OVERRIDE { return sizeof(TestDrawLooperContext); } + size_t contextSize() const SK_OVERRIDE { return sizeof(TestDrawLooperContext); } #ifndef SK_IGNORE_TO_STRING - virtual void toString(SkString* str) const SK_OVERRIDE { + void toString(SkString* str) const SK_OVERRIDE { str->append("TestLooper:"); } #endif @@ -36,7 +36,7 @@ private: TestDrawLooperContext() : fOnce(true) {} virtual ~TestDrawLooperContext() {} - virtual bool next(SkCanvas* canvas, SkPaint*) SK_OVERRIDE { + bool next(SkCanvas* canvas, SkPaint*) SK_OVERRIDE { if (fOnce) { fOnce = false; canvas->translate(SkIntToScalar(10), 0); diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp index 5f0195d0c2..4e1ad15bf4 100644 --- a/tests/RecordDrawTest.cpp +++ b/tests/RecordDrawTest.cpp @@ -24,7 +24,7 @@ class JustOneDraw : public SkPicture::AbortCallback { public: JustOneDraw() : fCalls(0) {} - virtual bool abort() SK_OVERRIDE { return fCalls++ > 0; } + bool abort() SK_OVERRIDE { return fCalls++ > 0; } private: int fCalls; }; @@ -123,7 +123,7 @@ DEF_TEST(RecordDraw_SetMatrixClobber, r) { } struct TestBBH : public SkBBoxHierarchy { - virtual void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE { + void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE { fEntries.setCount(N); for (int i = 0; i < N; i++) { Entry e = { (unsigned)i, (*boundsArray)[i] }; @@ -131,8 +131,8 @@ struct TestBBH : public SkBBoxHierarchy { } } - virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {} - virtual size_t bytesUsed() const SK_OVERRIDE { return 0; } + void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {} + size_t bytesUsed() const SK_OVERRIDE { return 0; } struct Entry { unsigned opIndex; diff --git a/tests/RecordReplaceDrawTest.cpp b/tests/RecordReplaceDrawTest.cpp index 9136ffce7b..bbf01686d0 100644 --- a/tests/RecordReplaceDrawTest.cpp +++ b/tests/RecordReplaceDrawTest.cpp @@ -26,7 +26,7 @@ class JustOneDraw : public SkPicture::AbortCallback { public: JustOneDraw() : fCalls(0) {} - virtual bool abort() SK_OVERRIDE { return fCalls++ > 0; } + bool abort() SK_OVERRIDE { return fCalls++ > 0; } private: int fCalls; }; diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp index c882654650..c2f1a798d6 100644 --- a/tests/SkpSkGrTest.cpp +++ b/tests/SkpSkGrTest.cpp @@ -146,7 +146,7 @@ public: fTestFun = testFun; } - virtual void run() SK_OVERRIDE { + void run() SK_OVERRIDE { SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024); (*fTestFun)(&fState); } diff --git a/tests/Test.cpp b/tests/Test.cpp index acbc332936..cf068690a6 100644 --- a/tests/Test.cpp +++ b/tests/Test.cpp @@ -66,20 +66,20 @@ public: const skiatest::Failure& failure(int i) const { return fFailures[i]; } protected: - virtual void onReportFailed(const Failure& failure) SK_OVERRIDE { + void onReportFailed(const Failure& failure) SK_OVERRIDE { fFailures.push_back(failure); } // Proxy down to fReporter. We assume these calls are threadsafe. - virtual bool allowExtendedTest() const SK_OVERRIDE { + bool allowExtendedTest() const SK_OVERRIDE { return fReporter->allowExtendedTest(); } - virtual void bumpTestCount() SK_OVERRIDE { + void bumpTestCount() SK_OVERRIDE { fReporter->bumpTestCount(); } - virtual bool verbose() const SK_OVERRIDE { + bool verbose() const SK_OVERRIDE { return fReporter->verbose(); } diff --git a/tests/Test.h b/tests/Test.h index 90cd25998f..4f838f501c 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -178,10 +178,10 @@ namespace skiatest { public: \ static Test* Factory(void*) { return SkNEW(name##Class); } \ protected: \ - virtual void onGetName(SkString* name) SK_OVERRIDE { \ + void onGetName(SkString* name) SK_OVERRIDE { \ name->set(#name); \ } \ - virtual void onRun(Reporter* r) SK_OVERRIDE { test_##name(r); } \ + void onRun(Reporter* r) SK_OVERRIDE { test_##name(r); } \ }; \ static TestRegistry gReg_##name##Class(name##Class::Factory); \ } \ @@ -194,10 +194,10 @@ namespace skiatest { public: \ static Test* Factory(void*) { return SkNEW(name##Class); } \ protected: \ - virtual void onGetName(SkString* name) SK_OVERRIDE { \ + void onGetName(SkString* name) SK_OVERRIDE { \ name->set(#name); \ } \ - virtual void onRun(Reporter* r) SK_OVERRIDE { \ + void onRun(Reporter* r) SK_OVERRIDE { \ test_##name(r, fGrContextFactory); \ } \ }; \ diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp index 1b5584b6a6..cf446d2105 100644 --- a/tests/skia_test.cpp +++ b/tests/skia_test.cpp @@ -54,17 +54,17 @@ class DebugfReporter : public Reporter { public: explicit DebugfReporter(int total) : fDone(0), fTotal(total) {} - virtual bool allowExtendedTest() const SK_OVERRIDE { return FLAGS_extendedTest; } - virtual bool verbose() const SK_OVERRIDE { return FLAGS_veryVerbose; } + bool allowExtendedTest() const SK_OVERRIDE { return FLAGS_extendedTest; } + bool verbose() const SK_OVERRIDE { return FLAGS_veryVerbose; } protected: - virtual void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE { + void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE { SkString desc; failure.getFailureString(&desc); SkDebugf("\nFAILED: %s", desc.c_str()); } - virtual void onEnd(Test* test) SK_OVERRIDE { + void onEnd(Test* test) SK_OVERRIDE { const int done = 1 + sk_atomic_inc(&fDone); if (!test->passed()) { diff --git a/tools/CopyTilesRenderer.h b/tools/CopyTilesRenderer.h index 92996bbea8..507e0fd2d4 100644 --- a/tools/CopyTilesRenderer.h +++ b/tools/CopyTilesRenderer.h @@ -38,9 +38,9 @@ namespace sk_tools { * Similar to TiledPictureRenderer, this will draw a PNG for each tile. However, the * numbering (and actual tiles) will be different. */ - virtual bool render(SkBitmap** out) SK_OVERRIDE; + bool render(SkBitmap** out) SK_OVERRIDE; - virtual bool supportsTimingIndividualTiles() SK_OVERRIDE { return false; } + bool supportsTimingIndividualTiles() SK_OVERRIDE { return false; } private: int fXTilesPerLargeTile; @@ -49,7 +49,7 @@ namespace sk_tools { int fLargeTileWidth; int fLargeTileHeight; - virtual SkString getConfigNameInternal() SK_OVERRIDE; + SkString getConfigNameInternal() SK_OVERRIDE; typedef TiledPictureRenderer INHERITED; }; diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index b3fef3caf5..0d7e14c794 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -841,7 +841,7 @@ public: GatherRenderer(const GrContext::Options& opts) : INHERITED(opts) { } #endif - virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE { + bool render(SkBitmap** out = NULL) SK_OVERRIDE { SkRect bounds = SkRect::MakeWH(SkIntToScalar(fPicture->cullRect().width()), SkIntToScalar(fPicture->cullRect().height())); SkData* data = SkPictureUtils::GatherPixelRefs(fPicture, bounds); @@ -851,7 +851,7 @@ public: } private: - virtual SkString getConfigNameInternal() SK_OVERRIDE { + SkString getConfigNameInternal() SK_OVERRIDE { return SkString("gather_pixelrefs"); } diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h index bfa09e397d..d52b988819 100644 --- a/tools/PictureRenderer.h +++ b/tools/PictureRenderer.h @@ -501,17 +501,17 @@ public: RecordPictureRenderer(const GrContext::Options &opts) : INHERITED(opts) { } #endif - virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE; + bool render(SkBitmap** out = NULL) SK_OVERRIDE; - virtual SkString getPerIterTimeFormat() SK_OVERRIDE { return SkString("%.4f"); } + SkString getPerIterTimeFormat() SK_OVERRIDE { return SkString("%.4f"); } - virtual SkString getNormalTimeFormat() SK_OVERRIDE { return SkString("%6.4f"); } + SkString getNormalTimeFormat() SK_OVERRIDE { return SkString("%6.4f"); } protected: - virtual SkCanvas* setupCanvas(int width, int height) SK_OVERRIDE; + SkCanvas* setupCanvas(int width, int height) SK_OVERRIDE; private: - virtual SkString getConfigNameInternal() SK_OVERRIDE; + SkString getConfigNameInternal() SK_OVERRIDE; typedef PictureRenderer INHERITED; }; @@ -522,10 +522,10 @@ public: PipePictureRenderer(const GrContext::Options &opts) : INHERITED(opts) { } #endif - virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE; + bool render(SkBitmap** out = NULL) SK_OVERRIDE; private: - virtual SkString getConfigNameInternal() SK_OVERRIDE; + SkString getConfigNameInternal() SK_OVERRIDE; typedef PictureRenderer INHERITED; }; @@ -543,10 +543,10 @@ public: bool useChecksumBasedFilenames, bool useMultiPictureDraw) SK_OVERRIDE; - virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE; + bool render(SkBitmap** out = NULL) SK_OVERRIDE; private: - virtual SkString getConfigNameInternal() SK_OVERRIDE; + SkString getConfigNameInternal() SK_OVERRIDE; typedef PictureRenderer INHERITED; }; @@ -571,9 +571,9 @@ public: * If fWritePath was provided, a separate file is * created for each tile, named "path0.png", "path1.png", etc. */ - virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE; + bool render(SkBitmap** out = NULL) SK_OVERRIDE; - virtual void end() SK_OVERRIDE; + void end() SK_OVERRIDE; void setTileWidth(int width) { fTileWidth = width; @@ -620,7 +620,7 @@ public: return fTileMinPowerOf2Width; } - virtual TiledPictureRenderer* getTiledRenderer() SK_OVERRIDE { return this; } + TiledPictureRenderer* getTiledRenderer() SK_OVERRIDE { return this; } virtual bool supportsTimingIndividualTiles() { return true; } @@ -655,8 +655,8 @@ public: protected: SkTDArray<SkIRect> fTileRects; - virtual SkCanvas* setupCanvas(int width, int height) SK_OVERRIDE; - virtual SkString getConfigNameInternal() SK_OVERRIDE; + SkCanvas* setupCanvas(int width, int height) SK_OVERRIDE; + SkString getConfigNameInternal() SK_OVERRIDE; private: int fTileWidth; @@ -692,18 +692,18 @@ public: PlaybackCreationRenderer(const GrContext::Options &opts) : INHERITED(opts) { } #endif - virtual void setup() SK_OVERRIDE; + void setup() SK_OVERRIDE; - virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE; + bool render(SkBitmap** out = NULL) SK_OVERRIDE; - virtual SkString getPerIterTimeFormat() SK_OVERRIDE { return SkString("%.4f"); } + SkString getPerIterTimeFormat() SK_OVERRIDE { return SkString("%.4f"); } - virtual SkString getNormalTimeFormat() SK_OVERRIDE { return SkString("%6.4f"); } + SkString getNormalTimeFormat() SK_OVERRIDE { return SkString("%6.4f"); } private: SkAutoTDelete<SkPictureRecorder> fRecorder; - virtual SkString getConfigNameInternal() SK_OVERRIDE; + SkString getConfigNameInternal() SK_OVERRIDE; typedef PictureRenderer INHERITED; }; diff --git a/tools/PictureResultsWriter.h b/tools/PictureResultsWriter.h index da005ad257..d3d346fd1c 100644 --- a/tools/PictureResultsWriter.h +++ b/tools/PictureResultsWriter.h @@ -56,22 +56,22 @@ public: fWriters.push_back(newWriter); } virtual ~PictureResultsMultiWriter() {} - virtual void bench(const char name[], int32_t x, int32_t y) SK_OVERRIDE { + void bench(const char name[], int32_t x, int32_t y) SK_OVERRIDE { for(int i=0; i<fWriters.count(); ++i) { fWriters[i]->bench(name, x, y); } } - virtual void logRenderer(sk_tools::PictureRenderer *pr) SK_OVERRIDE { + void logRenderer(sk_tools::PictureRenderer *pr) SK_OVERRIDE { for(int i=0; i<fWriters.count(); ++i) { fWriters[i]->logRenderer(pr); } } - virtual void tileMeta(int x, int y, int tx, int ty) SK_OVERRIDE { + void tileMeta(int x, int y, int tx, int ty) SK_OVERRIDE { for(int i=0; i<fWriters.count(); ++i) { fWriters[i]->tileMeta(x, y, tx, ty); } } - virtual void addTileFlag(PictureResultsWriter::TileFlags flag) SK_OVERRIDE { + void addTileFlag(PictureResultsWriter::TileFlags flag) SK_OVERRIDE { for(int i=0; i<fWriters.count(); ++i) { fWriters[i]->addTileFlag(flag); } @@ -87,7 +87,7 @@ public: numInnerLoops); } } - virtual void end() SK_OVERRIDE { + void end() SK_OVERRIDE { for(int i=0; i<fWriters.count(); ++i) { fWriters[i]->end(); } @@ -109,18 +109,18 @@ private: public: PictureResultsLoggerWriter(BenchLogger* log) : fLogger(log), fCurrentLine() {} - virtual void bench(const char name[], int32_t x, int32_t y) SK_OVERRIDE { + void bench(const char name[], int32_t x, int32_t y) SK_OVERRIDE { SkString result; result.printf("running bench [%i %i] %s ", x, y, name); this->logProgress(result.c_str()); } - virtual void logRenderer(sk_tools::PictureRenderer* renderer) SK_OVERRIDE { + void logRenderer(sk_tools::PictureRenderer* renderer) SK_OVERRIDE { fCurrentLine = renderer->getConfigName(); } - virtual void tileMeta(int x, int y, int tx, int ty) SK_OVERRIDE { + void tileMeta(int x, int y, int tx, int ty) SK_OVERRIDE { fCurrentLine.appendf(": tile [%i,%i] out of [%i,%i]", x, y, tx, ty); } - virtual void addTileFlag(PictureResultsWriter::TileFlags flag) SK_OVERRIDE { + void addTileFlag(PictureResultsWriter::TileFlags flag) SK_OVERRIDE { if(flag == PictureResultsWriter::kPurging) { fCurrentLine.append(" <withPurging>"); } else if(flag == PictureResultsWriter::kAvg) { @@ -138,7 +138,7 @@ public: results.append("\n"); this->logProgress(results.c_str()); } - virtual void end() SK_OVERRIDE {} + void end() SK_OVERRIDE {} private: BenchLogger* fLogger; SkString fCurrentLine; @@ -189,17 +189,17 @@ public: fBuilderData = this->makeBuilderJson(); } - virtual void bench(const char name[], int32_t x, int32_t y) SK_OVERRIDE { + void bench(const char name[], int32_t x, int32_t y) SK_OVERRIDE { fBenchName = SkString(name); } - virtual void logRenderer(sk_tools::PictureRenderer* pr) SK_OVERRIDE { + void logRenderer(sk_tools::PictureRenderer* pr) SK_OVERRIDE { fParams = pr->getJSONConfig(); fConfigString = pr->getConfigName(); } // Apparently tiles aren't used, so tileMeta is empty - virtual void tileMeta(int x, int y, int tx, int ty) SK_OVERRIDE {} + void tileMeta(int x, int y, int tx, int ty) SK_OVERRIDE {} // Flags aren't used, so addTileFlag is empty - virtual void addTileFlag(PictureResultsWriter::TileFlags flag) SK_OVERRIDE {} + void addTileFlag(PictureResultsWriter::TileFlags flag) SK_OVERRIDE {} virtual void tileData( TimerData* data, const char format[], @@ -241,7 +241,7 @@ public: fStream.writeText(Json::FastWriter().write(data).c_str()); } } - virtual void end() SK_OVERRIDE { + void end() SK_OVERRIDE { fStream.flush(); } private: diff --git a/tools/iOSShell.h b/tools/iOSShell.h index a0a0a5e8a5..9a9608f3be 100644 --- a/tools/iOSShell.h +++ b/tools/iOSShell.h @@ -20,7 +20,7 @@ public: virtual ~ShellWindow(); protected: - virtual void onSizeChange() SK_OVERRIDE; + void onSizeChange() SK_OVERRIDE; virtual bool onDispatchClick(int x, int y, Click::State, void* owner, unsigned modi) SK_OVERRIDE; diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp index 5e3385ef9b..678787780b 100644 --- a/tools/render_pdfs_main.cpp +++ b/tools/render_pdfs_main.cpp @@ -122,11 +122,11 @@ namespace { class NullWStream : public SkWStream { public: NullWStream() : fBytesWritten(0) { } - virtual bool write(const void*, size_t size) SK_OVERRIDE { + bool write(const void*, size_t size) SK_OVERRIDE { fBytesWritten += size; return true; } - virtual size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } + size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } size_t fBytesWritten; }; } // namespace diff --git a/tools/skpdiff/SkCLImageDiffer.h b/tools/skpdiff/SkCLImageDiffer.h index 56eccfbbc9..177940d977 100644 --- a/tools/skpdiff/SkCLImageDiffer.h +++ b/tools/skpdiff/SkCLImageDiffer.h @@ -26,7 +26,7 @@ class SkCLImageDiffer : public SkImageDiffer { public: SkCLImageDiffer(); - virtual bool requiresOpenCL() const SK_OVERRIDE { return true; } + bool requiresOpenCL() const SK_OVERRIDE { return true; } /** * Initializes the OpenCL resources this differ needs to work diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp index 32688f5013..c072c27955 100644 --- a/tools/skpdiff/SkDiffContext.cpp +++ b/tools/skpdiff/SkDiffContext.cpp @@ -219,7 +219,7 @@ public: fTestPath = testPath; } - virtual void run() SK_OVERRIDE { + void run() SK_OVERRIDE { fDiffContext->addDiff(fBaselinePath.c_str(), fTestPath.c_str()); } diff --git a/tools/skpdiff/SkDifferentPixelsMetric.h b/tools/skpdiff/SkDifferentPixelsMetric.h index 9302d9e067..0ef7337b5d 100644 --- a/tools/skpdiff/SkDifferentPixelsMetric.h +++ b/tools/skpdiff/SkDifferentPixelsMetric.h @@ -27,14 +27,14 @@ class SkDifferentPixelsMetric : public SkImageDiffer { #endif public: - virtual const char* getName() const SK_OVERRIDE; + const char* getName() const SK_OVERRIDE; virtual bool diff(SkBitmap* baseline, SkBitmap* test, const BitmapsToCreate& bitmapsToCreate, Result* result) const SK_OVERRIDE; protected: #if SK_SUPPORT_OPENCL - virtual bool onInit() SK_OVERRIDE; + bool onInit() SK_OVERRIDE; #endif private: diff --git a/tools/skpdiff/SkPMetric.h b/tools/skpdiff/SkPMetric.h index 00a3d7ae6b..8f7aa6a05b 100644 --- a/tools/skpdiff/SkPMetric.h +++ b/tools/skpdiff/SkPMetric.h @@ -18,7 +18,7 @@ */ class SkPMetric : public SkImageDiffer { public: - virtual const char* getName() const SK_OVERRIDE { return "perceptual"; } + const char* getName() const SK_OVERRIDE { return "perceptual"; } virtual bool diff(SkBitmap* baseline, SkBitmap* test, const BitmapsToCreate& bitmapsToCreate, Result* result) const SK_OVERRIDE; |