diff options
| author |  Mike Reed <reed@google.com> | 2016-10-28 15:42:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-28 20:06:17 +0000 |
| commit | 7d954ad797176afedb9262fdea4507d0fc60eb9d (patch) | |
| tree | 27c6dc324f83877371d91a58beb21e4b00176a94 /include/core/SkColorFilter.h | |
| parent | 99e3f7d6fcb7b3b4340286455733a7de9eb4ef81 (diff) | |
remove xfermode from public api
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4020
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Change-Id: I19cd056f2af778f10e8c6c2b7b2735593b43dbac
Reviewed-on: https://skia-review.googlesource.com/4020
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkColorFilter.h')
| -rw-r--r-- | include/core/SkColorFilter.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index f265998e05..e2ff406e1b 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -34,7 +34,7 @@ public: * returns true, and sets (if not NULL) the color and mode appropriately. * If not, this returns false and ignores the parameters. */ - virtual bool asColorMode(SkColor* color, SkXfermode::Mode* mode) const; + virtual bool asColorMode(SkColor* color, SK_XFERMODE_MODE_PARAM* mode) const; /** * If the filter can be represented by a 5x4 matrix, this @@ -110,15 +110,17 @@ public: If the Mode is DST, this function will return NULL (since that mode will have no effect on the result). @param c The source color used with the specified mode - @param mode The xfermode mode that is applied to each color in + @param mode The blend that is applied to each color in the colorfilter's filterSpan[16,32] methods @return colorfilter object that applies the src color and mode, or NULL if the mode will have no effect. */ - static sk_sp<SkColorFilter> MakeModeFilter(SkColor c, SkXfermode::Mode mode); - static sk_sp<SkColorFilter> MakeModeFilter(SkColor c, SkBlendMode mode) { - return MakeModeFilter(c, (SkXfermode::Mode)mode); + static sk_sp<SkColorFilter> MakeModeFilter(SkColor c, SkBlendMode mode); +#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM + static sk_sp<SkColorFilter> MakeModeFilter(SkColor c, SkXfermode::Mode mode) { + return MakeModeFilter(c, (SkBlendMode)mode); } +#endif /** Construct a colorfilter whose effect is to first apply the inner filter and then apply * the outer filter to the result of the inner's. |