| Index: include/effects/SkColorFilterImageFilter.h
|
| diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h
|
| index ebe263930d94d1f929edfa6a73cdc86143f4ce73..5ed051c0deece02e57a782a38c5a4807fc8a2c94 100644
|
| --- a/include/effects/SkColorFilterImageFilter.h
|
| +++ b/include/effects/SkColorFilterImageFilter.h
|
| @@ -14,12 +14,23 @@ class SkColorFilter;
|
|
|
| class SK_API SkColorFilterImageFilter : public SkImageFilter {
|
| public:
|
| - static SkImageFilter* Create(SkColorFilter* cf, SkImageFilter* input = NULL,
|
| - const CropRect* cropRect = NULL);
|
| + static sk_sp<SkImageFilter> Make(sk_sp<SkColorFilter> cf,
|
| + sk_sp<SkImageFilter> input,
|
| + const CropRect* cropRect = NULL);
|
|
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter)
|
|
|
| +#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
|
| + static SkImageFilter* Create(SkColorFilter* cf,
|
| + SkImageFilter* input = NULL,
|
| + const CropRect* cropRect = NULL) {
|
| + return Make(sk_ref_sp<SkColorFilter>(cf),
|
| + sk_ref_sp<SkImageFilter>(input),
|
| + cropRect).release();
|
| + }
|
| +#endif
|
| +
|
| protected:
|
| void flatten(SkWriteBuffer&) const override;
|
| sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
|
| @@ -28,8 +39,8 @@ protected:
|
| bool affectsTransparentBlack() const override;
|
|
|
| private:
|
| - SkColorFilterImageFilter(SkColorFilter* cf,
|
| - SkImageFilter* input,
|
| + SkColorFilterImageFilter(sk_sp<SkColorFilter> cf,
|
| + sk_sp<SkImageFilter> input,
|
| const CropRect* cropRect);
|
|
|
| sk_sp<SkColorFilter> fColorFilter;
|
|
|