From 29089179a66c06ef70da387111af75970f04ed53 Mon Sep 17 00:00:00 2001 From: "senorblanco@chromium.org" Date: Fri, 14 Mar 2014 16:48:39 +0000 Subject: Revert "Implement support for expanding crop rects in image filters" Breaking ImageFilterTests unit test. TBR=bsalomon@google.com BUG=skia: Review URL: https://codereview.chromium.org/196353021 git-svn-id: http://skia.googlecode.com/svn/trunk@13806 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkImageFilter.h | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'include/core/SkImageFilter.h') diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 0f52b69b84..4f33f54b6d 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -223,25 +223,10 @@ protected: // no inputs. virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const; - /** Computes source bounds as the src bitmap bounds offset by srcOffset. - * Apply the transformed crop rect to the bounds if any of the - * corresponding edge flags are set. Intersects the result against the - * context's clipBounds, and returns the result in "bounds". If there is - * no intersection, returns false and leaves "bounds" unchanged. - */ - bool applyCropRect(const Context&, const SkBitmap& src, const SkIPoint& srcOffset, - SkIRect* bounds) const; - - /** Same as the above call, except that if the resulting crop rect is not - * entirely contained by the source bitmap's bounds, it creates a new - * bitmap in "result" and pads the edges with transparent black. In that - * case, the srcOffset is modified to be the same as the bounds, since no - * further adjustment is needed by the caller. This version should only - * be used by filters which are not capable of processing a smaller - * source bitmap into a larger destination. - */ - bool applyCropRect(const Context&, Proxy* proxy, const SkBitmap& src, SkIPoint* srcOffset, - SkIRect* bounds, SkBitmap* result) const; + // Applies "matrix" to the crop rect, and sets "rect" to the intersection of + // "rect" and the transformed crop rect. If there is no overlap, returns + // false and leaves "rect" unchanged. + bool applyCropRect(SkIRect* rect, const SkMatrix& matrix) const; /** * Returns true if the filter can be expressed a single-pass -- cgit v1.2.3