From cfeb85fa6a2fcebc0c54f08f313058bae7258e63 Mon Sep 17 00:00:00 2001 From: jvanverth Date: Fri, 29 Apr 2016 07:38:10 -0700 Subject: Revert of Adjust tolerance to fix bezier glitches issue (patchset #1 id:1 of https://codereview.chromium.org/1926063002/ ) Reason for revert: This is causing undesirable image failures in a large number of Skia GMs. Original issue's description: > Adjust tolerance to fix bezier glitches issue > > In a previous CL: https://codereview.chromium.org/1126793003, the value > of gDegenerateToLineTol was changed from 1.0 to 0.25 which caused the > bezier glitches. > > This CL changes the value to SK_ScalarRoot2Over2, with this change the > bezier curve looks fine, and the result of the layout tests pointed out > in this bug: https://bugs.chromium.org/p/chromium/issues/detail?id=472847 > is also reasonable. > > BUG=605439 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926063002 > > Committed: https://skia.googlesource.com/skia/+/45a6f49ef9ff276e08025d0d2ba6a821a96d3f34 TBR=robertphillips@google.com,xidachen@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=605439 Review-Url: https://codereview.chromium.org/1933733002 --- src/gpu/batches/GrAAHairLinePathRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/batches') diff --git a/src/gpu/batches/GrAAHairLinePathRenderer.cpp b/src/gpu/batches/GrAAHairLinePathRenderer.cpp index fd6500f770..effd8c3b0f 100644 --- a/src/gpu/batches/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/batches/GrAAHairLinePathRenderer.cpp @@ -170,7 +170,7 @@ static int chop_conic(const SkPoint src[3], SkConic dst[4], const SkScalar weigh // in this case approx the path with lines // otherwise returns 1 static int is_degen_quad_or_conic(const SkPoint p[3], SkScalar* dsqd) { - static const SkScalar gDegenerateToLineTol = SK_ScalarRoot2Over2; + static const SkScalar gDegenerateToLineTol = GrPathUtils::kDefaultTolerance; static const SkScalar gDegenerateToLineTolSqd = SkScalarMul(gDegenerateToLineTol, gDegenerateToLineTol); -- cgit v1.2.3