diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-09-18 18:35:05 +0000 |
|---|---|---|
| committer |  Mike Reed <reed@google.com> | 2017-09-18 20:52:21 +0000 |
| commit | 2ad0908b6752c97446d824a3b62b05cb2bc7e6ca (patch) | |
| tree | 4064a37f7b76a803fc97a9f0c849c4807785f77b /include/effects | |
| parent | bf2d373147021d38b4017bfdb61f89f0c0718ae8 (diff) | |
Revert "Reland "Fix SkImageSource::filterBounds()""
This reverts commit bf12c079707a89f683ad0a6c989127fa20d9d202.
Reason for revert: broke the filterfastbounds GM (2nd column, 5th & 7th rows)
Original change's description:
> 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 <senorblanco@chromium.org>
> Reviewed-by: Stephen White <senorblanco@chromium.org>
TBR=senorblanco@chromium.org,reed@google.com,wangxianzhu@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I698433de66cf3de145b9319e09cb9ec9e30d2fa9
Reviewed-on: https://skia-review.googlesource.com/48160
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include/effects')
| -rw-r--r-- | include/effects/SkImageSource.h | 2 |
1 files changed, 0 insertions, 2 deletions
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<SkImageFilter> onMakeColorSpace(SkColorSpaceXformer*) const override; - SkIRect onFilterNodeBounds(const SkIRect&, const SkMatrix&, MapDirection) const override; - private: explicit SkImageSource(sk_sp<SkImage>); SkImageSource(sk_sp<SkImage>, |