Reset conicWeights in SkPath::consumeDegenerateSegments when rewinding to last Move op

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"
 #include "SkErrorInternals.h"
 #include "SkGeometry.h"
@@ skipping 1642 matching lines @@
          // Set the first return pt to the last pt of the previous primitive.
         return fPts[-1];
     }
 }
 
 void SkPath::Iter::consumeDegenerateSegments() {
     // We need to step over anything that will not move the current draw point
     // forward before the next move is seen
     const uint8_t* lastMoveVerb = 0;
     const SkPoint* lastMovePt = 0;
+    const SkScalar* lastMoveWeight = NULL;
     SkPoint lastPt = fLastPt;
     while (fVerbs != fVerbStop) {
         unsigned verb = *(fVerbs - 1); // fVerbs is one beyond the current verb
         switch (verb) {
             case kMove_Verb:
                 // Keep a record of this most recent move
                 lastMoveVerb = fVerbs;
                 lastMovePt = fPts;
+                lastMoveWeight = fConicWeights;
                 lastPt = fPts[0];
                 fVerbs--;
                 fPts++;
                 break;
 
             case kClose_Verb:
                 // A close when we are in a segment is always valid except when it
                 // follows a move which follows a segment.
                 if (fSegmentState == kAfterPrimitive_SegmentState && !lastMoveVerb) {
                     return;
                 }
                 // A close at any other time must be ignored
                 fVerbs--;
                 break;
 
             case kLine_Verb:
                 if (!IsLineDegenerate(lastPt, fPts[0])) {
                     if (lastMoveVerb) {
                         fVerbs = lastMoveVerb;
                         fPts = lastMovePt;
+                        fConicWeights = lastMoveWeight;
                         return;
                     }
                     return;
                 }
                 // Ignore this line and continue
                 fVerbs--;
                 fPts++;
                 break;
 
             case kConic_Verb:
             case kQuad_Verb:
                 if (!IsQuadDegenerate(lastPt, fPts[0], fPts[1])) {
                     if (lastMoveVerb) {
                         fVerbs = lastMoveVerb;
                         fPts = lastMovePt;
+                        fConicWeights = lastMoveWeight;
                         return;
                     }
                     return;
                 }
                 // Ignore this line and continue
                 fVerbs--;
                 fPts += 2;
                 fConicWeights += (kConic_Verb == verb);
                 break;
 
             case kCubic_Verb:
                 if (!IsCubicDegenerate(lastPt, fPts[0], fPts[1], fPts[2])) {
                     if (lastMoveVerb) {
                         fVerbs = lastMoveVerb;
                         fPts = lastMovePt;
+                        fConicWeights = lastMoveWeight;
                         return;
                     }
                     return;
                 }
                 // Ignore this line and continue
                 fVerbs--;
                 fPts += 3;
                 break;
 
             default:
@@ skipping 1055 matching lines @@
     switch (this->getFillType()) {
         case SkPath::kEvenOdd_FillType:
         case SkPath::kInverseEvenOdd_FillType:
             w &= 1;
             break;
         default:
             break;
     }
     return SkToBool(w);
 }