diff options
| author |  Mike Reed <reed@google.com> | 2016-09-26 18:51:24 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-27 10:33:06 +0000 |
| commit | 403d154591275b631464854e63c6050adf083686 (patch) | |
| tree | 1398cb50f863394c3f96b14f703f9a8e0e6c0065 /include/effects | |
| parent | ed924ceffb07d6f383aeb63eab336df4f13df0f1 (diff) | |
Revert "Revert "replace Arithmetic xfermode with imagefilter""
This reverts commit 10ff5bfa789b6b602464e8511fdf676c6f5b1bd4.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2680
TBR=
Change-Id: Iac2f4d48d227ff426ccf02b7eae280f382ad3580
Reviewed-on: https://skia-review.googlesource.com/2680
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/effects')
| -rw-r--r-- | include/effects/SkArithmeticMode.h | 4 | ||||
| -rw-r--r-- | include/effects/SkXfermodeImageFilter.h | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/effects/SkArithmeticMode.h b/include/effects/SkArithmeticMode.h index b160dc7e9b..81b9f85394 100644 --- a/include/effects/SkArithmeticMode.h +++ b/include/effects/SkArithmeticMode.h @@ -12,6 +12,8 @@ #include "SkScalar.h" #include "SkXfermode.h" +#ifdef SK_SUPPORT_LEGACY_ARITHMETICMODE + class SK_API SkArithmeticMode { public: /** @@ -38,3 +40,5 @@ private: }; #endif + +#endif diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index e39157550c..6066b8d2e0 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -26,6 +26,18 @@ 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, |