diff options
| author |  Mike Reed <reed@google.com> | 2016-10-03 12:57:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 17:17:10 +0000 |
| commit | 0591897548c8fcb7d53cc94053e01702e58f1ac5 (patch) | |
| tree | 099bf31c7bf4bd3062d2e7a8b4268a89f1fd61a2 /include/effects/SkXfermodeImageFilter.h | |
| parent | a224bb7027f022cf78376cb7afa2fff83d59153e (diff) | |
replace SkXfermode obj with SkBlendMode enum in paints
BUG=skia:5814
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714
Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135
Reviewed-on: https://skia-review.googlesource.com/2714
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/effects/SkXfermodeImageFilter.h')
| -rw-r--r-- | include/effects/SkXfermodeImageFilter.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 6066b8d2e0..fa9c857a7e 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -8,6 +8,7 @@ #ifndef SkXfermodeImageFilter_DEFINED #define SkXfermodeImageFilter_DEFINED +#include "SkBlendMode.h" #include "SkImageFilter.h" class SkXfermode; @@ -19,11 +20,11 @@ class SkXfermode; */ class SK_API SkXfermodeImageFilter { public: - static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter> background, + static sk_sp<SkImageFilter> Make(SkBlendMode, sk_sp<SkImageFilter> background, sk_sp<SkImageFilter> foreground, const SkImageFilter::CropRect* cropRect); - static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter> background) { - return Make(std::move(mode), std::move(background), nullptr, nullptr); + static sk_sp<SkImageFilter> Make(SkBlendMode mode, sk_sp<SkImageFilter> background) { + return Make(mode, std::move(background), nullptr, nullptr); } static sk_sp<SkImageFilter> MakeArithmetic(float k1, float k2, float k3, float k4, @@ -38,6 +39,16 @@ public: nullptr, nullptr); } +#ifdef SK_SUPPORT_LEGACY_XFERMODE_OBJECT + static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter> background, + sk_sp<SkImageFilter> foreground, + const SkImageFilter::CropRect* cropRect); + static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter> background) { + return Make(std::move(mode), std::move(background), nullptr, nullptr); + } + +#endif + #ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR static SkImageFilter* Create(SkXfermode* mode, SkImageFilter* background, SkImageFilter* foreground = NULL, |