diff options
-rw-r--r-- | include/core/SkMaskFilter.h | 2 | ||||
-rw-r--r-- | src/core/SkMaskFilter.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h index c4ee62083b..b32f4d3926 100644 --- a/include/core/SkMaskFilter.h +++ b/include/core/SkMaskFilter.h @@ -85,7 +85,7 @@ public: * (if not null). If they cannot be described as a blur, they return * kNone_BlurType and ignore the info parameter. */ - virtual BlurType asABlur(BlurInfo*); + virtual BlurType asABlur(BlurInfo*) const; protected: // empty for now, but lets get our subclass to remember to init us for the future diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp index 47e6b4763a..334de5e69a 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp @@ -49,7 +49,7 @@ bool SkMaskFilter::filterPath(const SkPath& devPath, const SkMatrix& matrix, return true; } -SkMaskFilter::BlurType SkMaskFilter::asABlur(BlurInfo*) { +SkMaskFilter::BlurType SkMaskFilter::asABlur(BlurInfo*) const { return kNone_BlurType; } diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 9fdd127879..c97acf2bac 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -18,14 +18,14 @@ public: uint32_t flags); // overrides from SkMaskFilter - virtual SkMask::Format getFormat(); + virtual SkMask::Format getFormat() SK_OVERRIDE; virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, - SkIPoint* margin); - virtual BlurType asABlur(BlurInfo*); + SkIPoint* margin) SK_OVERRIDE; + virtual BlurType asABlur(BlurInfo*) const SK_OVERRIDE; // overrides from SkFlattenable - virtual Factory getFactory(); - virtual void flatten(SkFlattenableWriteBuffer&); + virtual Factory getFactory() SK_OVERRIDE; + virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; static SkFlattenable* CreateProc(SkFlattenableReadBuffer&); @@ -128,7 +128,7 @@ static const SkMaskFilter::BlurType gBlurStyle2BlurType[] = { SkMaskFilter::kInner_BlurType, }; -SkMaskFilter::BlurType SkBlurMaskFilterImpl::asABlur(BlurInfo* info) { +SkMaskFilter::BlurType SkBlurMaskFilterImpl::asABlur(BlurInfo* info) const { if (info) { info->fRadius = fRadius; info->fIgnoreTransform = SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTransform_BlurFlag); |