son of path is rect bug
This variation tricks SkPath::isRect by exploiting
that the implementation resets the point pointer to
process the close verb, and using the reset pointer
to walk over a series of points that don't move.
In addition to fixing this, rename variables to
make the line creation more obvious, since left,
right, and friends, are not the left and right.
R=robertphillips@google.com
Bug: 824145,skia:7792
Change-Id: If8ebbc3eedd270652670d6e111a5bc02e61f0eec
Reviewed-on: https://skia-review.googlesource.com/121122
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Cary Clark <caryclark@skia.org>
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 62a3cd6..beb46eb 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -446,15 +446,16 @@
static int rect_make_dir(SkScalar dx, SkScalar dy) {
return ((0 != dx) << 0) | ((dx > 0 || dy > 0) << 1);
}
+
bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** ptsPtr,
bool* isClosed, Direction* direction, SkRect* rect) const {
int corners = 0;
- SkPoint previous; // used to construct line from previous point
+ SkPoint lineStart; // used to construct line from previous point
const SkPoint* firstPt = nullptr; // first point in the rect (last of first moves)
const SkPoint* lastPt = nullptr; // last point in the rect (last of lines or first if closed)
const SkPoint* pts = *ptsPtr;
const SkPoint* savePts = nullptr; // used to allow caller to iterate through a pair of rects
- previous.set(0, 0);
+ lineStart.set(0, 0);
int firstDirection = 0;
int lastDirection = 0;
int nextDirection = 0;
@@ -469,30 +470,26 @@
switch (verb) {
case kClose_Verb:
savePts = pts;
- pts = firstPt;
autoClose = true;
insertClose = false;
accumulatingRect = false;
case kLine_Verb: {
- SkScalar left = previous.fX;
- SkScalar top = previous.fY;
- SkScalar right = pts->fX;
- SkScalar bottom = pts->fY;
if (accumulatingRect) {
lastPt = pts;
}
- ++pts;
- if (left != right && top != bottom) {
+ SkPoint lineEnd = kClose_Verb == verb ? *firstPt : *pts++;
+ SkVector lineDelta = lineEnd - lineStart;
+ if (lineDelta.fX && lineDelta.fY) {
return false; // diagonal
}
addedLine = true;
- if (left == right && top == bottom) {
+ if (lineStart == lineEnd) {
break; // single point on side OK
}
- nextDirection = rect_make_dir(right - left, bottom - top);
+ nextDirection = rect_make_dir(lineDelta.fX, lineDelta.fY);
if (0 == corners) {
firstDirection = nextDirection;
- previous = pts[-1];
+ lineStart = lineEnd;
corners = 1;
closedOrMoved = false;
break;
@@ -509,7 +506,7 @@
return false; // too many direction changes
}
}
- previous = pts[-1];
+ lineStart = lineEnd;
if (lastDirection == nextDirection) {
break; // colinear segment
}
@@ -539,7 +536,7 @@
} else {
accumulatingRect = false;
}
- previous = *pts++;
+ lineStart = *pts++;
closedOrMoved = true;
break;
default: