aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/gradients
diff options
context:
space:
mode:
authorGravatar fmalita <fmalita@google.com>2016-03-02 06:34:24 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-02 06:34:24 -0800
commit734949099166f7bc446a352ce3596dc009484f59 (patch)
treebd46e5eb84d011d426fe3fafe3de3cce8472b8e8 /src/effects/gradients
parent2a7cf5f5090fb6489284547850d308b33086fad9 (diff)
Revert of Fix SkTwoPointConicalGradient zero-radius handling (patchset #2 id:20001 of https://codereview.chromium.org/1756573002/ )
Reason for revert: One layout test shows a regression: https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_rel/83359/layout-test-results/fast/gradients/crash-on-zero-radius-diffs.html Original issue's description: > 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 TBR=caryclark@google.com,reed@google.com,fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:5023 Review URL: https://codereview.chromium.org/1754113003
Diffstat (limited to 'src/effects/gradients')
-rw-r--r--src/effects/gradients/SkTwoPointConicalGradient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 2209306fe3..b938ebdec7 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -122,10 +122,10 @@ SkFixed TwoPtRadialContext::nextT() {
// find_quad_roots returns the values sorted, so we start with the last
float t = roots[countRoots - 1];
float r = lerp(fRec.fRadius, fRec.fDRadius, t);
- if (r < 0) {
+ if (r <= 0) {
t = roots[0]; // might be the same as roots[countRoots-1]
r = lerp(fRec.fRadius, fRec.fDRadius, t);
- if (r < 0) {
+ if (r <= 0) {
return TwoPtRadial::kDontDrawT;
}
}