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>
---
 gm/imagefilterscropped.cpp | 1 -
 gm/imagefiltersgraph.cpp   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'gm')

diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp
index 5af6492007..92b5fe0743 100644
--- a/gm/imagefilterscropped.cpp
+++ b/gm/imagefilterscropped.cpp
@@ -145,7 +145,6 @@ protected:
             SkErodeImageFilter::Make(8, 8, nullptr, &cropRect),
             SkMergeImageFilter::Make(nullptr,
                                      std::move(cfOffset),
-                                     SkBlendMode::kSrcOver,
                                      &cropRect),
             SkBlurImageFilter::Make(8.0f, 8.0f, nullptr, &bogusRect),
             SkColorFilterImageFilter::Make(cf, nullptr, &bogusRect),
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp
index 3436d6953f..a369dc0c59 100644
--- a/gm/imagefiltersgraph.cpp
+++ b/gm/imagefiltersgraph.cpp
@@ -52,8 +52,7 @@ protected:
             sk_sp<SkImageFilter> erode(SkErodeImageFilter::Make(4, 4, blur));
             sk_sp<SkImageFilter> color(SkColorFilterImageFilter::Make(std::move(cf),
                                                                       std::move(erode)));
-            sk_sp<SkImageFilter> merge(SkMergeImageFilter::Make(blur, color,
-                                                                SkBlendMode::kSrcOver));
+            sk_sp<SkImageFilter> merge(SkMergeImageFilter::Make(blur, color));
 
             SkPaint paint;
             paint.setImageFilter(std::move(merge));
-- 
cgit v1.2.3