diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-04 07:13:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 07:13:49 -0700 |
| commit | 3bc969264d4720d67f0b137552b3777a03b431a8 (patch) | |
| tree | 54124faab382a1531c40a2b32558ee14ca5b5507 /include/effects/SkXfermodeImageFilter.h | |
| parent | 94b87bd404d7007ce92672cc1853309df907e12a (diff) | |
Update SkXfermodeImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852123002
Review URL: https://codereview.chromium.org/1852123002
Diffstat (limited to 'include/effects/SkXfermodeImageFilter.h')
| -rw-r--r-- | include/effects/SkXfermodeImageFilter.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index f1e5d71070..268651ad24 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -21,16 +21,20 @@ class SK_API SkXfermodeImageFilter : public SkImageFilter { */ public: - static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* background, - SkImageFilter* foreground, const CropRect* cropRect); - static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, SkImageFilter* background) { - return Make(std::move(mode), background, nullptr, nullptr); + static sk_sp<SkImageFilter> Make(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter> background, + sk_sp<SkImageFilter> foreground, const 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); } -#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR + +#if defined(SK_SUPPORT_LEGACY_XFERMODE_PTR) || defined(SK_SUPPORT_LEGACY_IMAGEFILTER_PTR) static SkImageFilter* Create(SkXfermode* mode, SkImageFilter* background, SkImageFilter* foreground = NULL, const CropRect* cropRect = NULL) { - return Make(sk_ref_sp(mode), background, foreground, cropRect).release(); + return Make(sk_ref_sp(mode), + sk_ref_sp(background), + sk_ref_sp(foreground), + cropRect).release(); } #endif @@ -49,7 +53,7 @@ public: #endif protected: - SkXfermodeImageFilter(sk_sp<SkXfermode> mode, SkImageFilter* inputs[2], + SkXfermodeImageFilter(sk_sp<SkXfermode> mode, sk_sp<SkImageFilter> inputs[2], const CropRect* cropRect); void flatten(SkWriteBuffer&) const override; |