diff options
| author |  Mike Reed <reed@google.com> | 2017-06-18 23:35:57 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-19 14:01:56 +0000 |
| commit | 0bdaf05fc17ebe5d4ad01d70c80df2425e83c737 (patch) | |
| tree | e52b6e3c92b94cc6b8ab33f7fe47906106a38c38 /fuzz | |
| parent | ce6b4b004b2842e61cd9f86ebb75d1872044b382 (diff) | |
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>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/FilterFuzz.cpp | 3 | ||||
| -rw-r--r-- | fuzz/FuzzCanvas.cpp | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp index b2d99b771b..d15370707c 100644 --- a/fuzz/FilterFuzz.cpp +++ b/fuzz/FilterFuzz.cpp @@ -595,8 +595,7 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { case MERGE: { sk_sp<SkImageFilter> filA = make_image_filter(); sk_sp<SkImageFilter> filB = make_image_filter(); - SkBlendMode blend = make_blendmode(); - filter = SkMergeImageFilter::Make(filA, filB, blend); + filter = SkMergeImageFilter::Make(filA, filB); break; } case COLOR: { 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; |