| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index e85cc1f97fd45a8aadd134b28f0b482a1ff9a56a..3bab08b2a15a6cbc75698e4f5020d11c9272d6d7 100644
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -18,18 +18,11 @@ public:
|
|
|
| static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> first, sk_sp<SkImageFilter> second,
|
| SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,
|
| - const CropRect* cropRect = nullptr) {
|
| - sk_sp<SkImageFilter> inputs[2] = { first, second };
|
| - SkXfermode::Mode modes[2] = { mode, mode };
|
| - return sk_sp<SkImageFilter>(new SkMergeImageFilter(inputs, 2, modes, cropRect));
|
| - }
|
| -
|
| + const CropRect* cropRect = nullptr);
|
| static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> filters[],
|
| int count,
|
| const SkXfermode::Mode modes[] = nullptr,
|
| - const CropRect* cropRect = nullptr) {
|
| - return sk_sp<SkImageFilter>(new SkMergeImageFilter(filters, count, modes, cropRect));
|
| - }
|
| + const CropRect* cropRect = nullptr);
|
|
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
|
|
|