commit a19f024953f8b85b5f5fbda759d74c75514ea515
author Lee Salzman <lsalzman@mozilla.com> Thu Jan 12 13:06:21 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 23 22:08:37 2017 +0000
tree 89c536153d55e3087d11ce05c29c28d3a2d99ccc
parent 42e8c53b3ef58f887a623b410d9783b4d4ab4921

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>

src/core/SkPath.cpp

diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 53678de..4c7ebe5 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -263,14 +263,14 @@
 
     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: