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>
diff --git a/include/core/SkPathMeasure.h b/include/core/SkPathMeasure.h
index 287c292..1044f7e 100644
--- a/include/core/SkPathMeasure.h
+++ b/include/core/SkPathMeasure.h
@@ -84,10 +84,10 @@
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 @@
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);
diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp
index 5a00b17..0da448f 100644
--- a/src/core/SkPathMeasure.cpp
+++ b/src/core/SkPathMeasure.cpp
@@ -228,7 +228,7 @@
}
SkScalar SkPathMeasure::compute_quad_segs(const SkPoint pts[3],
- SkScalar distance, int mint, int maxt, unsigned ptIndex) {
+ SkScalar distance, int mint, int maxt, int ptIndex) {
if (tspan_big_enough(maxt - mint) && quad_too_curvy(pts)) {
SkPoint tmp[5];
int halft = (mint + maxt) >> 1;
@@ -253,7 +253,7 @@
SkScalar SkPathMeasure::compute_conic_segs(const SkConic& conic, SkScalar distance,
int mint, const SkPoint& minPt,
- int maxt, const SkPoint& maxPt, unsigned ptIndex) {
+ int maxt, const SkPoint& maxPt, int ptIndex) {
int halft = (mint + maxt) >> 1;
SkPoint halfPt = conic.evalAt(tValue2Scalar(halft));
if (tspan_big_enough(maxt - mint) && conic_too_curvy(minPt, halfPt, maxPt)) {
@@ -275,7 +275,7 @@
}
SkScalar SkPathMeasure::compute_cubic_segs(const SkPoint pts[4],
- SkScalar distance, int mint, int maxt, unsigned ptIndex) {
+ SkScalar distance, int mint, int maxt, int ptIndex) {
if (tspan_big_enough(maxt - mint) && cubic_too_curvy(pts)) {
SkPoint tmp[7];
int halft = (mint + maxt) >> 1;
@@ -300,10 +300,10 @@
void SkPathMeasure::buildSegments() {
SkPoint pts[4];
- unsigned ptIndex = fFirstPtIndex;
+ int ptIndex = fFirstPtIndex;
SkScalar distance = 0;
bool isClosed = fForceClosed;
- bool firstMoveTo = ptIndex == (unsigned) -1;
+ bool firstMoveTo = ptIndex < 0;
Segment* seg;
/* Note:
@@ -471,6 +471,7 @@
////////////////////////////////////////////////////////////////////////////////
SkPathMeasure::SkPathMeasure() {
+ fPath = nullptr;
fTolerance = CHEAP_DIST_LIMIT;
fLength = -1; // signal we need to compute it
fForceClosed = false;
@@ -478,13 +479,13 @@
}
SkPathMeasure::SkPathMeasure(const SkPath& path, bool forceClosed, SkScalar resScale) {
- fPath = path;
+ fPath = &path;
fTolerance = CHEAP_DIST_LIMIT * SkScalarInvert(resScale);
fLength = -1; // signal we need to compute it
fForceClosed = forceClosed;
fFirstPtIndex = -1;
- fIter.setPath(fPath, forceClosed);
+ fIter.setPath(path, forceClosed);
}
SkPathMeasure::~SkPathMeasure() {}
@@ -492,22 +493,20 @@
/** Assign a new path, or null to have none.
*/
void SkPathMeasure::setPath(const SkPath* path, bool forceClosed) {
- if (path) {
- fPath = *path;
- } else {
- fPath.reset();
- }
+ fPath = path;
fLength = -1; // signal we need to compute it
fForceClosed = forceClosed;
fFirstPtIndex = -1;
- fIter.setPath(fPath, forceClosed);
+ if (path) {
+ fIter.setPath(*path, forceClosed);
+ }
fSegments.reset();
fPts.reset();
}
SkScalar SkPathMeasure::getLength() {
- if (fPath.isEmpty()) {
+ if (fPath == nullptr) {
return 0;
}
if (fLength < 0) {
@@ -583,7 +582,7 @@
}
bool SkPathMeasure::getPosTan(SkScalar distance, SkPoint* pos, SkVector* tangent) {
- if (fPath.isEmpty()) {
+ if (nullptr == fPath) {
return false;
}
@@ -610,7 +609,7 @@
bool SkPathMeasure::getMatrix(SkScalar distance, SkMatrix* matrix,
MatrixFlags flags) {
- if (fPath.isEmpty()) {
+ if (nullptr == fPath) {
return false;
}