diff options
| author |  robertphillips <robertphillips@google.com> | 2015-06-04 11:15:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-04 11:15:27 -0700 |
| commit | 270fe6aad558cf60f182b440cd0c452340f96428 (patch) | |
| tree | 38623c5289edb2dec186dde4cff40f53ab54be0b /include/effects/SkTileImageFilter.h | |
| parent | 99a69eb152840c56e54244c3953f901be1d7d7bc (diff) | |
Revert of Fix dst bound reported by SkTileImageFilter (patchset #3 id:40001 of https://codereview.chromium.org/1152553006/)
Reason for revert:
Blink
Original issue's description:
> Fix dst bound reported by SkTileImageFilter
>
> In the example from the bug we had the filter DAG:
>
> color filter (table)
> 0: xfermode filter (arith)
> 0: tile filter [0,80,34,114] -> [0,80,800,480]
> 0: color filter (table)
> 0: bitmap src 34x34 -> [0,80,34,114]
> 1: color filter (table)
> 0: picture filter [0, 80, 800, 480]
>
> computeFastBounds was coming out of the DAG with a bound of [0,80,34,114] which didn't represent the pixels that would be drawn.
>
> This CL updates SkTileImageFilter to correctly set the bound for the pixels it will hit.
>
> BUG=493783
>
> Committed: https://skia.googlesource.com/skia/+/05be93bbdf09576f7903130e3b106b0a8c7c4b4e
>
> Committed: https://skia.googlesource.com/skia/+/0be685755f942baea26c66a87226b569fc17e960
TBR=reed@google.com,senorblanco@google.com,senorblanco@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=493783
Review URL: https://codereview.chromium.org/1156583004
Diffstat (limited to 'include/effects/SkTileImageFilter.h')
| -rw-r--r-- | include/effects/SkTileImageFilter.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h index 4dccf852be..a010205121 100644 --- a/include/effects/SkTileImageFilter.h +++ b/include/effects/SkTileImageFilter.h @@ -22,11 +22,10 @@ public: static SkTileImageFilter* Create(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input); - bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx, - SkBitmap* dst, SkIPoint* offset) const override; - bool onFilterBounds(const SkIRect& src, const SkMatrix&, - SkIRect* dst) const override; - void computeFastBounds(const SkRect& src, SkRect* dst) const override; + virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx, + SkBitmap* dst, SkIPoint* offset) const override; + virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, + SkIRect* dst) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter) |