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>
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index d884644..95a1333 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -196,9 +196,7 @@
input, cropRect));
}
- this->addFilter("merge", SkMergeImageFilter::Make(input, input,
- SkBlendMode::kSrcOver,
- cropRect));
+ this->addFilter("merge", SkMergeImageFilter::Make(input, input, cropRect));
{
SkPaint greenColorShaderPaint;
@@ -213,8 +211,7 @@
this->addFilter("merge with disjoint inputs", SkMergeImageFilter::Make(
- std::move(paintFilterLeft), std::move(paintFilterRight),
- SkBlendMode::kSrcOver, cropRect));
+ std::move(paintFilterLeft), std::move(paintFilterRight), cropRect));
}
this->addFilter("offset",
@@ -959,7 +956,7 @@
greenBM.eraseColor(SK_ColorGREEN);
sk_sp<SkImage> greenImage(SkImage::MakeFromBitmap(greenBM));
sk_sp<SkImageFilter> source(SkImageSource::Make(std::move(greenImage)));
- sk_sp<SkImageFilter> merge(SkMergeImageFilter::Make(source, source, SkBlendMode::kSrcOver));
+ sk_sp<SkImageFilter> merge(SkMergeImageFilter::Make(source, source));
sk_sp<SkSpecialImage> srcImg(create_empty_special_image(context, 1));
@@ -1865,13 +1862,13 @@
} recs[] = {
{ cfif, true },
{ SkColorFilterImageFilter::Make(cf, cfif), true },
- { SkMergeImageFilter::Make(cfif, cfif, SkBlendMode::kSrcOver), true },
+ { SkMergeImageFilter::Make(cfif, cfif), true },
{ SkComposeImageFilter::Make(cfif, cfif), true },
{ blif, false },
{ SkBlurImageFilter::Make(3, 3, cfif), false },
{ SkColorFilterImageFilter::Make(cf, blif), false },
- { SkMergeImageFilter::Make(cfif, blif, SkBlendMode::kSrcOver), false },
+ { SkMergeImageFilter::Make(cfif, blif), false },
{ SkComposeImageFilter::Make(blif, cfif), false },
};