| Index: src/core/SkPathMeasure.cpp | 
| diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp | 
| index bc5350373cbccf63dd895bbc61e7202f529ed991..5c4398527e1c06842798dbf9a88ead2a5ed159b7 100644 | 
| --- a/src/core/SkPathMeasure.cpp | 
| +++ b/src/core/SkPathMeasure.cpp | 
| @@ -73,6 +73,7 @@ static bool quad_too_curvy(const SkPoint pts[3]) { | 
| return dist > CHEAP_DIST_LIMIT; | 
| } | 
|  | 
| +#ifndef SK_SUPPORT_LEGACY_CONIC_MEASURE | 
| static bool conic_too_curvy(const SkPoint& firstPt, const SkPoint& midTPt, | 
| const SkPoint& lastPt) { | 
| SkPoint midEnds = firstPt + lastPt; | 
| @@ -81,6 +82,7 @@ static bool conic_too_curvy(const SkPoint& firstPt, const SkPoint& midTPt, | 
| SkScalar dist = SkMaxScalar(SkScalarAbs(dxy.fX), SkScalarAbs(dxy.fY)); | 
| return dist > CHEAP_DIST_LIMIT; | 
| } | 
| +#endif | 
|  | 
| static bool cheap_dist_exceeds_limit(const SkPoint& pt, | 
| SkScalar x, SkScalar y) { | 
|  |