Skip to content

Commit a10494c

Browse files
Cary ClarkSkia Commit-Bot
authored andcommitted
remove legacy switch
Chrome tests have been rebased and legacy define has been removed, so remove from Skia as well. R=fmalita@chromium.org Bug:843966 Change-Id: I3794b8457c581f71d4bd30eb81d6fa4c8a589cad Reviewed-on: https://skia-review.googlesource.com/c/176224 Auto-Submit: Cary Clark <caryclark@skia.org> Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org>
1 parent 1564069 commit a10494c

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/core/SkStroke.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -591,11 +591,7 @@ static bool quad_in_line(const SkPoint quad[3]) {
591591
SkASSERT(outer2 >= 1 && outer2 <= 2);
592592
SkASSERT(outer1 < outer2);
593593
int mid = outer1 ^ outer2 ^ 3;
594-
#ifdef SK_USE_LEGACY_CONIC_CURVATURE_SLOP
595-
const float kCurvatureSlop = 0.00001f;
596-
#else
597594
const float kCurvatureSlop = 0.000005f; // this multiplier is pulled out of the air
598-
#endif
599595
SkScalar lineSlop = ptMax * ptMax * kCurvatureSlop;
600596
return pt_to_line(quad[mid], quad[outer1], quad[outer2]) <= lineSlop;
601597
}
@@ -656,16 +652,9 @@ SkPathStroker::ReductionType SkPathStroker::CheckConicLinear(const SkConic& coni
656652
if (!conic_in_line(conic)) {
657653
return kQuad_ReductionType;
658654
}
659-
#ifdef SK_USE_LEGACY_CONIC_CURVATURE_SLOP
660-
SkScalar xT = 0, yT = 0;
661-
(void) conic.findXExtrema(&xT);
662-
(void) conic.findYExtrema(&yT);
663-
SkScalar t = SkTMax(xT, yT);
664-
#else
665655
// SkFindConicMaxCurvature would be a better solution, once we know how to
666656
// implement it. Quad curvature is a reasonable substitute
667657
SkScalar t = SkFindQuadMaxCurvature(conic.fPts);
668-
#endif
669658
if (0 == t) {
670659
return kLine_ReductionType;
671660
}

0 commit comments

Comments
 (0)