diff options
| author |  Mike Reed <reed@google.com> | 2016-09-26 20:40:57 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-26 20:53:19 +0000 |
| commit | 10ff5bfa789b6b602464e8511fdf676c6f5b1bd4 (patch) | |
| tree | 1eb96e7533f882aa935b5d62132f4205bfedd2c9 /include/effects/SkXfermodeImageFilter.h | |
| parent | 29111a3e71f59b26c1feebf6b30db5c68a27d5a9 (diff) | |
Revert "replace Arithmetic xfermode with imagefilter"
This reverts commit Ia3f3b721854c516f3b7f8c44f71f40a8a2eeb9b4.
Reason for revert: need to guard the no-gpu codepath
Original issue's description:
> replace Arithmetic xfermode with imagefilter
>
> chrome pre-cl: https://codereview.chromium.org/2369023002/
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2595
>
> Change-Id: Ia3f3b721854c516f3b7f8c44f71f40a8a2eeb9b4
> Reviewed-on: https://skia-review.googlesource.com/2595
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
>
TBR=robertphillips@google.com,fmalita@chromium.org,fmalita@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I761799b594a0379c6bf356e6abc73552c3d19480
Reviewed-on: https://skia-review.googlesource.com/2661
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include/effects/SkXfermodeImageFilter.h')
| -rw-r--r-- | include/effects/SkXfermodeImageFilter.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 6066b8d2e0..e39157550c 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -26,18 +26,6 @@ public: return Make(std::move(mode), std::move(background), nullptr, nullptr); } - static sk_sp<SkImageFilter> MakeArithmetic(float k1, float k2, float k3, float k4, - bool enforcePMColor, - sk_sp<SkImageFilter> background, - sk_sp<SkImageFilter> foreground, - const SkImageFilter::CropRect* cropRect); - static sk_sp<SkImageFilter> MakeArithmetic(float k1, float k2, float k3, float k4, - bool enforcePMColor, - sk_sp<SkImageFilter> background) { - return MakeArithmetic(k1, k2, k3, k4, enforcePMColor, std::move(background), - nullptr, nullptr); - } - #ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR static SkImageFilter* Create(SkXfermode* mode, SkImageFilter* background, SkImageFilter* foreground = NULL, |