| Index: src/utils/SkGatherPixelRefsAndRects.h
|
| diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h
|
| index 9589c3ea3852ba8a5fb2ffeccc13d47823c9186b..6f1e1b5e469c1febc5b911935d27678ab6880cf9 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,
|
|
|