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

Unified Diff: src/utils/SkPictureUtils.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/utils/SkMD5.h ('k') | src/utils/SkSHA1.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkPictureUtils.cpp
diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp
index 2c6b8f56b53db57b0f013bebae18dc142217c0f6..dadd89a665990ff989d6a7aeb97df24a62519d8b 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;
« no previous file with comments | « src/utils/SkMD5.h ('k') | src/utils/SkSHA1.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698