From 374772bd61951f01bf84fe17bf53d8867681c9ae Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 5 Oct 2016 17:33:02 -0700 Subject: 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 --- include/effects/SkXfermodeImageFilter.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'include/effects/SkXfermodeImageFilter.h') 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 Make(sk_sp mode, sk_sp background, + static sk_sp Make(SkBlendMode, sk_sp background, sk_sp foreground, const SkImageFilter::CropRect* cropRect); - static sk_sp Make(sk_sp mode, sk_sp background) { - return Make(std::move(mode), std::move(background), nullptr, nullptr); + static sk_sp Make(SkBlendMode mode, sk_sp background) { + return Make(mode, std::move(background), nullptr, nullptr); } static sk_sp 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 Make(sk_sp mode, sk_sp background, + sk_sp foreground, + const SkImageFilter::CropRect* cropRect); + static sk_sp Make(sk_sp mode, sk_sp 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, -- cgit v1.2.3