| commit | 5edf82e651630308f99b65506eaff0bb17c88e79 | [log] [tgz] |
|---|---|---|
| author | fmalita <fmalita@chromium.org> | Thu Mar 03 06:41:54 2016 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Mar 03 06:41:54 2016 -0800 |
| tree | e0cd5bdb2fe5a9e1f61eef17574e288dd2786794 | |
| parent | 62c0f75159674087079140e09ef1396316577754 [diff] [blame] |
[Reland] Fix SkTwoPointConicalGradient zero-radius handling r == 0 is within valid gradient range, we shouldn't skip it. BUG=skia:5023 R=caryclark@google.com,reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1756573002 Committed: https://skia.googlesource.com/skia/+/9c0b02a557e9be663a0eb07519e1b6a61a6c3df2 Review URL: https://codereview.chromium.org/1756573002
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 5444c1c..985d459 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp
@@ -840,8 +840,10 @@ if (!valid_grad(colors, pos, colorCount, mode)) { return nullptr; } - if (start == end && startRadius == endRadius) { - return SkShader::CreateEmptyShader(); + if (startRadius == endRadius) { + if (start == end || startRadius == 0) { + return SkShader::CreateEmptyShader(); + } } EXPAND_1_COLOR(colorCount);