aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Lee Salzman <lsalzman@mozilla.com>2017-01-12 13:06:21 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-23 22:08:37 +0000
commita19f024953f8b85b5f5fbda759d74c75514ea515 (patch)
tree89c536153d55e3087d11ce05c29c28d3a2d99ccc /src
parent42e8c53b3ef58f887a623b410d9783b4d4ab4921 (diff)
make SkPath::conservativelyContainsRect consume degenerate segments
BUG=skia: Change-Id: I3a39318bceaf6c95a50d84961d93af4ba62550e3 Reviewed-on: https://skia-review.googlesource.com/6900 Reviewed-by: Cary Clark <caryclark@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/SkPath.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 53678de40e..4c7ebe5879 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -263,14 +263,14 @@ bool SkPath::conservativelyContainsRect(const SkRect& rect) const {
SkPoint firstPt;
SkPoint prevPt;
- RawIter iter(*this);
+ SkPath::Iter iter(*this, true);
SkPath::Verb verb;
SkPoint pts[4];
SkDEBUGCODE(int moveCnt = 0;)
SkDEBUGCODE(int segmentCount = 0;)
SkDEBUGCODE(int closeCount = 0;)
- while ((verb = iter.next(pts)) != kDone_Verb) {
+ while ((verb = iter.next(pts, true, true)) != kDone_Verb) {
int nextPt = -1;
switch (verb) {
case kMove_Verb: