diff options
author | Mike Reed <reed@google.com> | 2017-07-22 22:12:59 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-24 12:53:19 +0000 |
commit | 40e7e655341c5bf56e398cd2f5902dda79d702a0 (patch) | |
tree | 1f4e887f232d53e24a9cdf791eea8660c9dac70b /fuzz | |
parent | 71f867c2294655ccf8981500ad5a3beefb71295e (diff) |
remove (unused?) arcto patheffect
Bug: skia:
Change-Id: I80943cc495eb1edce839387f4b9512a66a4e5c11
Reviewed-on: https://skia-review.googlesource.com/25981
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'fuzz')
-rw-r--r-- | fuzz/FilterFuzz.cpp | 18 | ||||
-rw-r--r-- | fuzz/FuzzCanvas.cpp | 12 |
2 files changed, 9 insertions, 21 deletions
diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp index d15370707c..015a0a06aa 100644 --- a/fuzz/FilterFuzz.cpp +++ b/fuzz/FilterFuzz.cpp @@ -8,7 +8,6 @@ #include "Sk1DPathEffect.h" #include "Sk2DPathEffect.h" #include "SkAlphaThresholdFilter.h" -#include "SkArcToPathEffect.h" #include "SkBlurImageFilter.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" @@ -414,12 +413,14 @@ static sk_sp<SkPathEffect> make_path_effect(bool canBeNull = true) { fuzz->nextRange(&s, 0, 2); if (canBeNull && s == 0) { return pathEffect; } - fuzz->nextRange(&s, 0, 8); + fuzz->nextRange(&s, 0, 7); switch (s) { case 0: { - SkScalar a = make_number(true); - pathEffect = SkArcToPathEffect::Make(a); + SkPath path = make_path(); + SkMatrix m; + init_matrix(&m); + pathEffect = SkPath2DPathEffect::Make(m, path); break; } case 1: { @@ -463,14 +464,7 @@ static sk_sp<SkPathEffect> make_path_effect(bool canBeNull = true) { pathEffect = SkLine2DPathEffect::Make(a, m); break; } - case 7: { - SkPath path = make_path(); - SkMatrix m; - init_matrix(&m); - pathEffect = SkPath2DPathEffect::Make(m, path); - break; - } - case 8: + case 7: default: { sk_sp<SkPathEffect> a = make_path_effect(false); sk_sp<SkPathEffect> b = make_path_effect(false); diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 317578caca..bcd4619615 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -28,7 +28,6 @@ #include "Sk1DPathEffect.h" #include "Sk2DPathEffect.h" #include "SkAlphaThresholdFilter.h" -#include "SkArcToPathEffect.h" #include "SkArithmeticImageFilter.h" #include "SkBlurImageFilter.h" #include "SkBlurMaskFilter.h" @@ -496,7 +495,7 @@ static sk_sp<SkPathEffect> make_fuzz_patheffect(Fuzz* fuzz, int depth) { return nullptr; } uint8_t pathEffectType; - fuzz->nextRange(&pathEffectType, 0, 9); + fuzz->nextRange(&pathEffectType, 0, 8); switch (pathEffectType) { case 0: { return nullptr; @@ -536,14 +535,9 @@ static sk_sp<SkPathEffect> make_fuzz_patheffect(Fuzz* fuzz, int depth) { case 6: { SkScalar radius; fuzz->next(&radius); - return SkArcToPathEffect::Make(radius); - } - case 7: { - SkScalar radius; - fuzz->next(&radius); return SkCornerPathEffect::Make(radius); } - case 8: { + case 7: { SkScalar phase; fuzz->next(&phase); SkScalar intervals[20]; @@ -552,7 +546,7 @@ static sk_sp<SkPathEffect> make_fuzz_patheffect(Fuzz* fuzz, int depth) { fuzz->nextN(intervals, count); return SkDashPathEffect::Make(intervals, count, phase); } - case 9: { + case 8: { SkScalar segLength, dev; uint32_t seed; fuzz->next(&segLength, &dev, &seed); |