diff options
| -rw-r--r-- | include/core/SkMaskFilter.h | 8 | ||||
| -rw-r--r-- | src/core/SkMaskFilter.cpp | 3 | ||||
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 9 | ||||
| -rw-r--r-- | tools/PictureRenderer.cpp | 10 | ||||
| -rw-r--r-- | tools/PictureRenderer.h | 7 | ||||
| -rw-r--r-- | tools/bench_pictures_main.cpp | 1 |
6 files changed, 5 insertions, 33 deletions
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h index 3060e2f542..02f58551b4 100644 --- a/include/core/SkMaskFilter.h +++ b/include/core/SkMaskFilter.h @@ -81,14 +81,6 @@ public: virtual BlurType asABlur(BlurInfo*) const; /** - * TEMPORARY HACK -- SkMaskFilters are designed to be immutable - * Optional method for maskfilters that can be described as a blur. If so, - * set the current blur to respect the [radius / ignore-transform / - * quality] settings. - */ - virtual void setAsABlur(const BlurInfo& ); - - /** * The fast bounds function is used to enable the paint to be culled early * in the drawing pipeline. This function accepts the current bounds of the * paint as its src param and the filter adjust those bounds using its diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp index c4a7346b91..eef21393c4 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp @@ -262,9 +262,6 @@ SkMaskFilter::BlurType SkMaskFilter::asABlur(BlurInfo*) const { return kNone_BlurType; } -void SkMaskFilter::setAsABlur(const BlurInfo& ) { -} - void SkMaskFilter::computeFastBounds(const SkRect& src, SkRect* dst) { SkMask srcM, dstM; diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 98ea4f50fa..a3991cae0d 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -21,7 +21,6 @@ public: virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, SkIPoint* margin) SK_OVERRIDE; virtual BlurType asABlur(BlurInfo*) const SK_OVERRIDE; - virtual void setAsABlur(const BlurInfo&) SK_OVERRIDE; virtual void computeFastBounds(const SkRect& src, SkRect* dst) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurMaskFilterImpl) @@ -287,14 +286,6 @@ SkMaskFilter::BlurType SkBlurMaskFilterImpl::asABlur(BlurInfo* info) const { return gBlurStyle2BlurType[fBlurStyle]; } -void SkBlurMaskFilterImpl::setAsABlur(const BlurInfo& info) { - fRadius = info.fRadius; - fBlurFlags = (fBlurFlags & ~(SkBlurMaskFilter::kIgnoreTransform_BlurFlag - | SkBlurMaskFilter::kHighQuality_BlurFlag)) - | (info.fIgnoreTransform ? SkBlurMaskFilter::kIgnoreTransform_BlurFlag : 0) - | (info.fHighQuality ? SkBlurMaskFilter::kHighQuality_BlurFlag : 0); -} - SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl) SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index 102216d595..ab8727470c 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -62,17 +62,11 @@ public: virtual bool filter(SkPaint* paint, Type t) { paint->setFlags(paint->getFlags() & ~fFlags[t] & SkPaint::kAllFlags); - if ((PictureRenderer::kBlur_DrawFilterFlag | PictureRenderer::kLowBlur_DrawFilterFlag) - & fFlags[t]) { + if (PictureRenderer::kBlur_DrawFilterFlag & fFlags[t]) { SkMaskFilter* maskFilter = paint->getMaskFilter(); SkMaskFilter::BlurInfo blurInfo; if (maskFilter && maskFilter->asABlur(&blurInfo)) { - if (PictureRenderer::kBlur_DrawFilterFlag & fFlags[t]) { - paint->setMaskFilter(NULL); - } else { - blurInfo.fHighQuality = false; - maskFilter->setAsABlur(blurInfo); - } + paint->setMaskFilter(NULL); } } if (PictureRenderer::kHinting_DrawFilterFlag & fFlags[t]) { diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h index ada7bd4220..262e8997e6 100644 --- a/tools/PictureRenderer.h +++ b/tools/PictureRenderer.h @@ -55,10 +55,9 @@ public: enum DrawFilterFlags { kNone_DrawFilterFlag = 0, kBlur_DrawFilterFlag = 0x4000, // toggles between blur and no blur - kLowBlur_DrawFilterFlag = 0x8000, // toggles between low and high quality blur - kHinting_DrawFilterFlag = 0x10000, // toggles between no hinting and normal hinting - kSlightHinting_DrawFilterFlag = 0x20000, // toggles between slight and normal hinting - kAAClip_DrawFilterFlag = 0x40000, // toggles between soft and hard clip + kHinting_DrawFilterFlag = 0x8000, // toggles between no hinting and normal hinting + kSlightHinting_DrawFilterFlag = 0x10000, // toggles between slight and normal hinting + kAAClip_DrawFilterFlag = 0x20000, // toggles between soft and hard clip }; SK_COMPILE_ASSERT(!(kBlur_DrawFilterFlag & SkPaint::kAllFlags), blur_flag_must_be_greater); diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp index 3e3bc33ad5..65fc42ad36 100644 --- a/tools/bench_pictures_main.cpp +++ b/tools/bench_pictures_main.cpp @@ -50,7 +50,6 @@ static char const * const gFilterFlags[] = { "verticalText", "genA8FromLCD", "blur", - "lowBlur", "hinting", "slightHinting", "AAClip", |