diff options
| author |  Cary Clark <caryclark@skia.org> | 2017-07-31 13:24:28 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-31 17:48:38 +0000 |
| commit | 66e393c68982ce6f097b6e0f7dd1eb656f25f944 (patch) | |
| tree | fa4dd0d51ffd7891af9361c5e82a66eaf4281a48 /src | |
| parent | d9b6773052951b86b20f4ff078920089d888a67c (diff) | |
longer is better
R=robertphillips@google.com
Bug: 749315
Change-Id: Id8091a077771553b313aaf3aff20b7b37765cc53
Reviewed-on: https://skia-review.googlesource.com/28787
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkStroke.cpp | 8 | ||||
| -rw-r--r-- | src/core/SkStrokerPriv.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp index ddc5a6ab3b..7e5d4e3939 100644 --- a/src/core/SkStroke.cpp +++ b/src/core/SkStroke.cpp @@ -26,7 +26,7 @@ static_assert(1 == kCubic_RecursiveLimit, "cubic_stroke_relies_on_cubic_equallin static_assert(SK_ARRAY_COUNT(kRecursiveLimits) == kQuad_RecursiveLimit + 1, "recursive_limits_mismatch"); -#if defined SK_DEBUG && QUAD_STROKE_APPROXIMATION +#if defined SK_DEBUG && QUAD_STROKE_APPROX_EXTENDED_DEBUGGING int gMaxRecursion[SK_ARRAY_COUNT(kRecursiveLimits)] = { 0 }; #endif #ifndef DEBUG_QUAD_STROKER @@ -1141,7 +1141,7 @@ bool SkPathStroker::cubicStroke(const SkPoint cubic[4], SkQuadConstruct* quadPts if (!SkScalarIsFinite(quadPts->fQuad[2].fX) || !SkScalarIsFinite(quadPts->fQuad[2].fY)) { return false; // just abort if projected quad isn't representable } -#if QUAD_STROKE_APPROXIMATION +#if QUAD_STROKE_APPROX_EXTENDED_DEBUGGING SkDEBUGCODE(gMaxRecursion[fFoundTangents] = SkTMax(gMaxRecursion[fFoundTangents], fRecursionDepth + 1)); #endif @@ -1179,7 +1179,7 @@ bool SkPathStroker::conicStroke(const SkConic& conic, SkQuadConstruct* quadPts) addDegenerateLine(quadPts); return true; } -#if QUAD_STROKE_APPROXIMATION +#if QUAD_STROKE_APPROX_EXTENDED_DEBUGGING SkDEBUGCODE(gMaxRecursion[kConic_RecursiveLimit] = SkTMax(gMaxRecursion[kConic_RecursiveLimit], fRecursionDepth + 1)); #endif @@ -1211,7 +1211,7 @@ bool SkPathStroker::quadStroke(const SkPoint quad[3], SkQuadConstruct* quadPts) addDegenerateLine(quadPts); return true; } -#if QUAD_STROKE_APPROXIMATION +#if QUAD_STROKE_APPROX_EXTENDED_DEBUGGING SkDEBUGCODE(gMaxRecursion[kQuad_RecursiveLimit] = SkTMax(gMaxRecursion[kQuad_RecursiveLimit], fRecursionDepth + 1)); #endif diff --git a/src/core/SkStrokerPriv.h b/src/core/SkStrokerPriv.h index f763805381..3dd44387f2 100644 --- a/src/core/SkStrokerPriv.h +++ b/src/core/SkStrokerPriv.h @@ -19,7 +19,7 @@ #define CUBIC_ARC_FACTOR ((SK_ScalarSqrt2 - SK_Scalar1) * 4 / 3) // this enables a global which is not thread-safe; doing so triggers a TSAN error in Chrome tests. -#define QUAD_STROKE_APPROXIMATION 0 // set to 1 to enable additional debugging in StrokerTest.cpp +#define QUAD_STROKE_APPROX_EXTENDED_DEBUGGING 0 // set to 1 to enable debugging in StrokerTest.cpp class SkStrokerPriv { public: |