diff options
| author |  caryclark <caryclark@google.com> | 2016-01-25 06:33:01 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-25 06:33:02 -0800 |
| commit | a273c0f6676b261ef82bc43b0dcc53282f2bdf8c (patch) | |
| tree | 1dd7adbdaa79b9e116e3b3680af48e8877f9acf9 /include/core/SkPathMeasure.h | |
| parent | 8f66a8862f96bb364cfc857df7d29757f62f3396 (diff) | |
remove legacy defines
The defines
SK_SUPPORT_LEGACY_ARCTO
SK_SUPPORT_LEGACY_CONIC_MEASURE
SK_SUPPORT_LEGACY_DASH_MEASURE
SK_SUPPORT_LEGACY_HAIR_IGNORES_CAPS
SK_SUPPORT_LEGACY_PATH_MEASURE_TVALUE
have been removed from Chrome. This removes the obsolete code
from Skia as well.
R=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1627703002
Review URL: https://codereview.chromium.org/1627703002
Diffstat (limited to 'include/core/SkPathMeasure.h')
| -rw-r--r-- | include/core/SkPathMeasure.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/core/SkPathMeasure.h b/include/core/SkPathMeasure.h index c6bf288db2..c8c0c5352b 100644 --- a/include/core/SkPathMeasure.h +++ b/include/core/SkPathMeasure.h @@ -94,11 +94,7 @@ private: struct Segment { SkScalar fDistance; // total distance up to this point unsigned fPtIndex; // index into the fPts array -#ifdef SK_SUPPORT_LEGACY_PATH_MEASURE_TVALUE - unsigned fTValue : 15; -#else unsigned fTValue : 30; -#endif unsigned fType : 2; SkScalar getScalarT() const; @@ -111,20 +107,14 @@ private: void buildSegments(); SkScalar compute_quad_segs(const SkPoint pts[3], SkScalar distance, int mint, int maxt, int ptIndex); -#ifdef SK_SUPPORT_LEGACY_CONIC_MEASURE - SkScalar compute_conic_segs(const SkConic&, SkScalar distance, int mint, int maxt, int ptIndex); -#else SkScalar compute_conic_segs(const SkConic&, SkScalar distance, int mint, const SkPoint& minPt, int maxt, const SkPoint& maxPt, int ptIndex); -#endif SkScalar compute_cubic_segs(const SkPoint pts[3], SkScalar distance, int mint, int maxt, int ptIndex); const Segment* distanceToSegment(SkScalar distance, SkScalar* t); bool quad_too_curvy(const SkPoint pts[3]); -#ifndef SK_SUPPORT_LEGACY_CONIC_MEASURE bool conic_too_curvy(const SkPoint& firstPt, const SkPoint& midTPt,const SkPoint& lastPt); -#endif bool cheap_dist_exceeds_limit(const SkPoint& pt, SkScalar x, SkScalar y); bool cubic_too_curvy(const SkPoint pts[4]); }; |