| Index: src/core/SkImageFilter.cpp
|
| diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
|
| index 489a52bf8751363b7313016f92b5cc25dd7dff82..141d2e03fbea36eaf89c74dda95aa12b18d25ea6 100644
|
| --- a/src/core/SkImageFilter.cpp
|
| +++ b/src/core/SkImageFilter.cpp
|
| @@ -397,12 +397,8 @@ bool SkImageFilter::applyCropRect(const Context& ctx, const SkBitmap& src,
|
| }
|
| src.getBounds(srcBounds);
|
| srcBounds->offset(srcOffset);
|
| -#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS
|
| - return fCropRect.applyTo(*srcBounds, ctx, dstBounds);
|
| -#else
|
| this->onFilterNodeBounds(*srcBounds, ctx.ctm(), dstBounds, kForward_MapDirection);
|
| return fCropRect.applyTo(*dstBounds, ctx, dstBounds);
|
| -#endif
|
| }
|
|
|
| bool SkImageFilter::applyCropRect(const Context& ctx, Proxy* proxy, const SkBitmap& src,
|
| @@ -410,13 +406,9 @@ bool SkImageFilter::applyCropRect(const Context& ctx, Proxy* proxy, const SkBitm
|
| SkIRect srcBounds;
|
| src.getBounds(&srcBounds);
|
| srcBounds.offset(*srcOffset);
|
| -#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS
|
| - if (!fCropRect.applyTo(srcBounds, ctx, bounds)) {
|
| -#else
|
| SkIRect dstBounds;
|
| this->onFilterNodeBounds(srcBounds, ctx.ctm(), &dstBounds, kForward_MapDirection);
|
| if (!fCropRect.applyTo(dstBounds, ctx, bounds)) {
|
| -#endif
|
| return false;
|
| }
|
|
|
| @@ -472,14 +464,10 @@ void SkImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatrix&,
|
|
|
|
|
| SkImageFilter::Context SkImageFilter::mapContext(const Context& ctx) const {
|
| -#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS
|
| - return ctx;
|
| -#else
|
| SkIRect clipBounds;
|
| this->onFilterNodeBounds(ctx.clipBounds(), ctx.ctm(), &clipBounds,
|
| MapDirection::kReverse_MapDirection);
|
| return Context(ctx.ctm(), clipBounds, ctx.cache());
|
| -#endif
|
| }
|
|
|
| bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrTexture*,
|
|
|