Make SkPath::conservativelyContainsRect not assert on paths that begin with repeated moveTos

src/core/SkPath.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBuffer.h"
@@ skipping 283 matching lines @@
     if (!this->cheapComputeDirection(&direction)) {
         return false;
     }
 
     SkPoint firstPt;
     SkPoint prevPt;
     RawIter iter(*this);
     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) {
         int nextPt = -1;
         switch (verb) {
             case kMove_Verb:
-                SkASSERT(!moveCnt);
+                SkASSERT(!segmentCount && !closeCount);
                 SkDEBUGCODE(++moveCnt);
                 firstPt = prevPt = pts[0];
                 break;
             case kLine_Verb:
                 nextPt = 1;
-                SkASSERT(moveCnt);
+                SkASSERT(moveCnt && !closeCount);
+                SkDEBUGCODE(++segmentCount);
                 break;
             case kQuad_Verb:
             case kConic_Verb:
-                SkASSERT(moveCnt);
+                SkASSERT(moveCnt && !closeCount);
+                SkDEBUGCODE(++segmentCount);
                 nextPt = 2;
                 break;
             case kCubic_Verb:
-                SkASSERT(moveCnt);
+                SkASSERT(moveCnt && !closeCount);
+                SkDEBUGCODE(++segmentCount);
                 nextPt = 3;
                 break;
             case kClose_Verb:
+                SkDEBUGCODE(++closeCount;)
                 break;
             default:
                 SkDEBUGFAIL("unknown verb");
         }
         if (-1 != nextPt) {
             if (!check_edge_against_rect(prevPt, pts[nextPt], rect, direction)) {
                 return false;
             }
             prevPt = pts[nextPt];
         }
@@ skipping 2652 matching lines @@
     switch (this->getFillType()) {
         case SkPath::kEvenOdd_FillType:
         case SkPath::kInverseEvenOdd_FillType:
             w &= 1;
             break;
         default:
             break;
     }
     return SkToBool(w);
 }