From b6d2be1330f16fe05f1eed5abda927c0fbb50055 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 15 Sep 2017 20:30:28 +0000 Subject: Revert "Fix SkImageSource::filterBounds()" This reverts commit cb4d58766668b003fea67798027fc25d84acd059. Reason for revert: speculative fix for broken layout tests https://storage.googleapis.com/chromium-layout-test-archives/linux_chromium_rel_ng/547101/layout-test-results/results.html +fast/css/transformed-mask.html images diff image pass +svg/W3C-SVG-1.1-SE/filters-image-03-f.svg images diff image pass +svg/W3C-SVG-1.1-SE/filters-image-05-f.svg images diff image pass +svg/W3C-SVG-1.1/filters-displace-01-f.svg images diff image pass +svg/filters/feImage-preserveAspectRatio-all.svg images diff image pass +svg/filters/feImage-preserveAspectratio.svg images diff image pass Original change's description: > Fix SkImageSource::filterBounds() > > Previously SkImageSource::filterBounds() uses the default > SkImageFilter::onFilterNodeBounds() which returns the input rect. > > Now override onFilterNodeBounds() in SkImageSource to return src > or dst rect (with transform applied). > > Change-Id: I6681e1ba97affb09ef1ca5bc03b3d0f66c10f149 > Reviewed-on: https://skia-review.googlesource.com/46741 > Commit-Queue: Mike Reed > Reviewed-by: Mike Reed TBR=senorblanco@chromium.org,reed@google.com,wangxianzhu@chromium.org Change-Id: Ib335f8e2ccbadc2335d23bc5f122fc5de53a8740 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/47342 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- include/effects/SkImageSource.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/effects') diff --git a/include/effects/SkImageSource.h b/include/effects/SkImageSource.h index f2c1274f29..04348c68e8 100644 --- a/include/effects/SkImageSource.h +++ b/include/effects/SkImageSource.h @@ -31,8 +31,6 @@ protected: SkIPoint* offset) const override; sk_sp onMakeColorSpace(SkColorSpaceXformer*) const override; - SkIRect onFilterNodeBounds(const SkIRect&, const SkMatrix&, MapDirection) const override; - private: explicit SkImageSource(sk_sp); SkImageSource(sk_sp, -- cgit v1.2.3