From bf12c079707a89f683ad0a6c989127fa20d9d202 Mon Sep 17 00:00:00 2001 From: Xianzhu Wang Date: Fri, 15 Sep 2017 19:57:53 -0700 Subject: Reland "Fix SkImageSource::filterBounds()" This relands commit cb4d58766668b003fea67798027fc25d84acd059 which was reverted by commit b6d2be1330f16fe05f1eed5abda927c0fbb50055 because the original CL broke some blink layout tests. This reland let SkImageSource::filterBounds() return the dst rect with ctm applied regardless of direction. Original description: > 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: I915b7889ff59829ddbc4479cd66d75a0bb581e54 Reviewed-on: https://skia-review.googlesource.com/47501 Commit-Queue: Stephen White Reviewed-by: Stephen White --- include/effects/SkImageSource.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/effects') diff --git a/include/effects/SkImageSource.h b/include/effects/SkImageSource.h index 04348c68e8..f2c1274f29 100644 --- a/include/effects/SkImageSource.h +++ b/include/effects/SkImageSource.h @@ -31,6 +31,8 @@ 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