only add pathmeasure segment if the accumulated length was actually changed,
and not based on if the local length was > 0. This is necessary since
assert(delta > 0); // true
prevDistance = distance;
distance += delta;
assert(distance > prevDistance); // not always true
Fixes https://bugs.webkit.org/show_bug.cgi?id=78979
git-svn-id: http://skia.googlecode.com/svn/trunk@3739 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp
index 04d19c2..0d4dcd4 100644
--- a/src/core/SkPathMeasure.cpp
+++ b/src/core/SkPathMeasure.cpp
@@ -147,11 +147,16 @@
void SkPathMeasure::buildSegments() {
SkPoint pts[4];
int ptIndex = fFirstPtIndex;
- SkScalar d, distance = 0;
+ SkScalar distance = 0;
bool isClosed = fForceClosed;
bool firstMoveTo = ptIndex < 0;
Segment* seg;
+ /* Note:
+ * as we accumulate distance, we have to check that the result of +=
+ * actually made it larger, since a very small delta might be > 0, but
+ * still have no effect on distance (if distance >>> delta).
+ */
fSegments.reset();
bool done = false;
do {
@@ -166,32 +171,41 @@
firstMoveTo = false;
break;
- case SkPath::kLine_Verb:
- d = SkPoint::Distance(pts[0], pts[1]);
+ case SkPath::kLine_Verb: {
+ SkScalar d = SkPoint::Distance(pts[0], pts[1]);
SkASSERT(d >= 0);
+ SkScalar prevD = distance;
distance += d;
- seg = fSegments.append();
- seg->fDistance = distance;
- seg->fPtIndex = ptIndex;
- seg->fType = kLine_SegType;
- seg->fTValue = kMaxTValue;
- fPts.append(1, pts + 1);
- ptIndex++;
- break;
+ if (distance > prevD) {
+ seg = fSegments.append();
+ seg->fDistance = distance;
+ seg->fPtIndex = ptIndex;
+ seg->fType = kLine_SegType;
+ seg->fTValue = kMaxTValue;
+ fPts.append(1, pts + 1);
+ ptIndex++;
+ }
+ } break;
- case SkPath::kQuad_Verb:
+ case SkPath::kQuad_Verb: {
+ SkScalar prevD = distance;
distance = this->compute_quad_segs(pts, distance, 0,
kMaxTValue, ptIndex);
- fPts.append(2, pts + 1);
- ptIndex += 2;
- break;
+ if (distance > prevD) {
+ fPts.append(2, pts + 1);
+ ptIndex += 2;
+ }
+ } break;
- case SkPath::kCubic_Verb:
+ case SkPath::kCubic_Verb: {
+ SkScalar prevD = distance;
distance = this->compute_cubic_segs(pts, distance, 0,
kMaxTValue, ptIndex);
- fPts.append(3, pts + 1);
- ptIndex += 3;
- break;
+ if (distance > prevD) {
+ fPts.append(3, pts + 1);
+ ptIndex += 3;
+ }
+ } break;
case SkPath::kClose_Verb:
isClosed = true;