diff options
author | 2018-03-09 20:50:25 +0000 | |
---|---|---|
committer | 2018-03-09 20:50:31 +0000 | |
commit | 0fc41da384fdb7e52b3254b33d663e55912e7fea (patch) | |
tree | d43fb07073bd923b71ed1dd82fe6f6ee4aca50ec /include | |
parent | d9779bcf93c2e11699230a54214309732b9161a7 (diff) |
Revert "start hardening pathmeasure"
This reverts commit 429a5406733e44cd9d379fc9aa0e2e206cc8867d.
Reason for revert: <failed dm>
Original change's description:
> start hardening pathmeasure
>
> change int to unsigned (just make it uniform,
> part of it was already unsigned)
>
> change path by pointer to path by value
> since it will be copied on write; fixes bug
> where path changes from underneath measure
>
> R=​reed@google.com
>
> Bug: skia:7675
> Change-Id: Ibfcfd4379cabd86b4ef4ea9ff6788d5ccb137ac1
> Reviewed-on: https://skia-review.googlesource.com/113269
> Commit-Queue: Cary Clark <caryclark@skia.org>
> Reviewed-by: Mike Reed <reed@google.com>
TBR=reed@google.com,caryclark@skia.org
Change-Id: I35f89c135233b166b09ce8887a967da3b1407db8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7675
Reviewed-on: https://skia-review.googlesource.com/113480
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkPathMeasure.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/core/SkPathMeasure.h b/include/core/SkPathMeasure.h index 287c292aeb..1044f7eeb0 100644 --- a/include/core/SkPathMeasure.h +++ b/include/core/SkPathMeasure.h @@ -84,10 +84,10 @@ public: private: SkPath::Iter fIter; - SkPath fPath; + const SkPath* fPath; SkScalar fTolerance; SkScalar fLength; // relative to the current contour - unsigned fFirstPtIndex; // relative to the current contour + int fFirstPtIndex; // relative to the current contour bool fIsClosed; // relative to the current contour bool fForceClosed; @@ -107,12 +107,12 @@ private: void buildSegments(); SkScalar compute_quad_segs(const SkPoint pts[3], SkScalar distance, - int mint, int maxt, unsigned ptIndex); + int mint, int maxt, int ptIndex); SkScalar compute_conic_segs(const SkConic&, SkScalar distance, int mint, const SkPoint& minPt, - int maxt, const SkPoint& maxPt, unsigned ptIndex); + int maxt, const SkPoint& maxPt, int ptIndex); SkScalar compute_cubic_segs(const SkPoint pts[3], SkScalar distance, - int mint, int maxt, unsigned ptIndex); + int mint, int maxt, int ptIndex); const Segment* distanceToSegment(SkScalar distance, SkScalar* t); bool quad_too_curvy(const SkPoint pts[3]); bool conic_too_curvy(const SkPoint& firstPt, const SkPoint& midTPt,const SkPoint& lastPt); |