commit 734949099166f7bc446a352ce3596dc009484f59
author fmalita <fmalita@google.com> Wed Mar 02 06:34:24 2016 -0800
committer Commit bot <commit-bot@chromium.org> Wed Mar 02 06:34:24 2016 -0800
tree bd46e5eb84d011d426fe3fafe3de3cce8472b8e8
parent 2a7cf5f5090fb6489284547850d308b33086fad9

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

src/effects/gradients/SkTwoPointConicalGradient.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 2209306..b938ebd 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -122,10 +122,10 @@
     // 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;
         }
     }

tests/GradientTest.cpp

diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index cc94cba..6a277d5 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
 #include "SkColorShader.h"
 #include "SkGradientShader.h"
 #include "SkShader.h"
@@ -234,33 +233,10 @@
     surface->getCanvas()->drawRect(r, paint);
 }
 
-// https://bugs.chromium.org/p/skia/issues/detail?id=5023
-// We should still shade pixels for which the radius is exactly 0.
-static void test_two_point_conical_zero_radius(skiatest::Reporter* reporter) {
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(5, 5));
-    surface->getCanvas()->clear(SK_ColorRED);
-
-    const SkColor colors[] = { SK_ColorGREEN, SK_ColorBLUE };
-    SkAutoTUnref<SkShader> shader(SkGradientShader::CreateTwoPointConical(
-        SkPoint::Make(2.5f, 2.5f), 0,
-        SkPoint::Make(3.0f, 3.0f), 10,
-        colors, nullptr, SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode));
-    SkPaint p;
-    p.setShader(shader);
-    surface->getCanvas()->drawPaint(p);
-
-    // r == 0 for the center pixel.
-    // verify that we draw it (no red bleed)
-    SkPMColor centerPMColor;
-    surface->readPixels(SkImageInfo::MakeN32Premul(1, 1), &centerPMColor, sizeof(SkPMColor), 2, 2);
-    REPORTER_ASSERT(reporter, SkGetPackedR32(centerPMColor) == 0);
-}
-
 DEF_TEST(Gradient, reporter) {
     TestGradientShaders(reporter);
     TestConstantGradient(reporter);
     test_big_grad(reporter);
     test_nearly_vertical(reporter);
     test_linear_fuzz(reporter);
-    test_two_point_conical_zero_radius(reporter);
 }