From 0bdaf05fc17ebe5d4ad01d70c80df2425e83c737 Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Sun, 18 Jun 2017 23:35:57 -0400
Subject: remove unused mode parameter from SkMergeImageFilter

Bug: skia:
Change-Id: Iaa46aaef130a337987c3528685f59c56387d4a7d
Reviewed-on: https://skia-review.googlesource.com/20210
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
---
 fuzz/FuzzCanvas.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'fuzz/FuzzCanvas.cpp')

diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index fb90c06305..cdca73118b 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -838,34 +838,30 @@ static sk_sp<SkImageFilter> make_fuzz_imageFilter(Fuzz* fuzz, int depth) {
         case 14: {
             sk_sp<SkImageFilter> first = make_fuzz_imageFilter(fuzz, depth - 1);
             sk_sp<SkImageFilter> second = make_fuzz_imageFilter(fuzz, depth - 1);
-            SkBlendMode blendMode;
             bool useCropRect;
-            fuzz->next(&useCropRect, &blendMode);
+            fuzz->next(&useCropRect);
             SkImageFilter::CropRect cropRect;
             if (useCropRect) {
                 fuzz->next(&cropRect);
             }
-            return SkMergeImageFilter::Make(std::move(first), std::move(second), blendMode,
+            return SkMergeImageFilter::Make(std::move(first), std::move(second),
                                             useCropRect ? &cropRect : nullptr);
         }
         case 15: {
             constexpr int kMaxCount = 4;
             sk_sp<SkImageFilter> ifs[kMaxCount];
-            SkBlendMode blendModes[kMaxCount];
             int count;
             fuzz->nextRange(&count, 1, kMaxCount);
             for (int i = 0; i < count; ++i) {
                 ifs[i] = make_fuzz_imageFilter(fuzz, depth - 1);
             }
-            fuzz->nextN(blendModes, count);
             bool useCropRect;
             fuzz->next(&useCropRect);
             SkImageFilter::CropRect cropRect;
             if (useCropRect) {
                 fuzz->next(&cropRect);
             }
-            return SkMergeImageFilter::MakeN(ifs, count, blendModes,
-                                             useCropRect ? &cropRect : nullptr);
+            return SkMergeImageFilter::Make(ifs, count, useCropRect ? &cropRect : nullptr);
         }
         case 16: {
             int rx, ry;
-- 
cgit v1.2.3