From d247e5862ef9f7130f36ba91aae43a09659eade3 Mon Sep 17 00:00:00 2001 From: senorblanco Date: Thu, 21 Jan 2016 06:49:15 -0800 Subject: Remove SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS (now unused). BUG=skia:3194 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1616503002 Review URL: https://codereview.chromium.org/1616503002 --- src/core/SkCanvas.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/core/SkCanvas.cpp') diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index e577b21932..cd7c6f8a14 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1071,25 +1071,11 @@ bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveLayerFlags saveLayerFlag const SkMatrix& ctm = fMCRec->fMatrix; // this->getTotalMatrix() -// This is a temporary hack, until individual filters can do their own -// bloating, when this will be removed. -#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS - SkRect storage; -#endif if (imageFilter) { imageFilter->filterBounds(clipBounds, ctm, &clipBounds); -#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS - if (bounds && imageFilter->canComputeFastBounds()) { - imageFilter->computeFastBounds(*bounds, &storage); - bounds = &storage; - } else { - bounds = nullptr; - } -#else if (bounds && !imageFilter->canComputeFastBounds()) { bounds = nullptr; } -#endif } SkIRect ir; if (bounds) { @@ -1433,11 +1419,7 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y, const SkBitmap& src = srcDev->accessBitmap(false); SkMatrix matrix = *iter.fMatrix; matrix.postTranslate(SkIntToScalar(-pos.x()), SkIntToScalar(-pos.y())); -#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS - SkIRect clipBounds = SkIRect::MakeWH(srcDev->width(), srcDev->height()); -#else SkIRect clipBounds = iter.fClip->getBounds().makeOffset(-pos.x(), -pos.y()); -#endif SkAutoTUnref cache(dstDev->getImageFilterCache()); SkImageFilter::Context ctx(matrix, clipBounds, cache.get()); if (filter->filterImage(&proxy, src, ctx, &dst, &offset)) { -- cgit v1.2.3