diff options
| author |  reed <reed@google.com> | 2016-10-05 17:33:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-05 17:33:03 -0700 |
| commit | 374772bd61951f01bf84fe17bf53d8867681c9ae (patch) | |
| tree | ade94be090be12f7503fd35e77c4dae2dc1f0a47 /include/effects/SkXfermodeImageFilter.h | |
| parent | 61c21cdcc31081a1bd4a3a7480b482d135f7df33 (diff) | |
Revert[8] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit c245574ba3d0e2ade6c94b2812de3baa383bf4c4.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2396953002
TBR=
Review-Url: https://codereview.chromium.org/2396953002
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, |