Rewriting path writer

src/pathops/SkPathOpsSimplify.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkAddIntersections.h"
 #include "SkOpCoincidence.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkPathOpsCommon.h"
 #include "SkPathWriter.h"
 
-static bool bridgeWinding(SkOpContourHead* contourList, SkPathWriter* simple, bool* closable) {
+static bool bridgeWinding(SkOpContourHead* contourList, SkPathWriter* simple) {
     bool unsortable = false;
     do {
         SkOpSpan* span = FindSortableTop(contourList);
         if (!span) {
             break;
         }
         SkOpSegment* current = span->segment();
         SkOpSpanBase* start = span->next();
         SkOpSpanBase* end = span;
         SkTDArray<SkOpSpanBase*> chase;
         do {
             if (current->activeWinding(start, end)) {
                 do {
                     if (!unsortable && current->done()) {
                           break;
                     }
                     SkASSERT(unsortable || !current->done());
                     SkOpSpanBase* nextStart = start;
                     SkOpSpanBase* nextEnd = end;
                     SkOpSegment* next = current->findNextWinding(&chase, &nextStart, &nextEnd,
                             &unsortable);
                     if (!next) {
                         if (!unsortable && simple->hasMove()
                                 && current->verb() != SkPath::kLine_Verb
                                 && !simple->isClosed()) {
                             // FIXME: put in the next two lines to avoid handling already added
                             if (start->starter(end)->checkAlreadyAdded()) {
-                                simple->close();
+                                simple->finishContour();
                             } else if (!current->addCurveTo(start, end, simple)) {
                                 return false;
                             }
                             if (!simple->isClosed()) {
                                 SkPathOpsDebug::ShowActiveSpans(contourList);
                             }
                         }
                         break;
                     }
         #if DEBUG_FLOW
@@ skipping 10 matching lines @@
                 } while (!simple->isClosed() && (!unsortable || !start->starter(end)->done()));
                 if (current->activeWinding(start, end) && !simple->isClosed()) {
                     SkOpSpan* spanStart = start->starter(end);
                     if (!spanStart->done()) {
                         if (!current->addCurveTo(start, end, simple)) {
                             return false;
                         }
                         current->markDone(spanStart);
                     }
                 }
-                simple->close();
+                simple->finishContour();
             } else {
                 SkOpSpanBase* last = current->markAndChaseDone(start, end);
                 if (last && !last->chased()) {
                     last->setChased(true);
                     SkASSERT(!SkPathOpsDebug::ChaseContains(chase, last));
                     *chase.append() = last;
 #if DEBUG_WINDING
                     SkDebugf("%s chase.append id=%d", __FUNCTION__, last->segment()->debugID());
                     if (!last->final()) {
                          SkDebugf(" windSum=%d", last->upCast()->windSum());
                     }
                     SkDebugf("\n");
 #endif
                 }
             }
             current = FindChase(&chase, &start, &end);
             SkPathOpsDebug::ShowActiveSpans(contourList);
             if (!current) {
                 break;
             }
         } while (true);
     } while (true);
-    *closable = !simple->someAssemblyRequired();
     return true;
 }
 
 // returns true if all edges were processed
-static bool bridgeXor(SkOpContourHead* contourList, SkPathWriter* simple, bool* closable) {
+static bool bridgeXor(SkOpContourHead* contourList, SkPathWriter* simple) {
     SkOpSegment* current;
     SkOpSpanBase* start;
     SkOpSpanBase* end;
     bool unsortable = false;
-    *closable = true;
     while ((current = FindUndone(contourList, &start, &end))) {
         do {
             if (!unsortable && current->done()) {
                 SkPathOpsDebug::ShowActiveSpans(contourList);
             }
             SkASSERT(unsortable || !current->done());
             SkOpSpanBase* nextStart = start;
             SkOpSpanBase* nextEnd = end;
             SkOpSegment* next = current->findNextXor(&nextStart, &nextEnd, &unsortable);
             if (!next) {
@@ skipping 23 matching lines @@
         } while (!simple->isClosed() && (!unsortable || !start->starter(end)->done()));
         if (!simple->isClosed()) {
             SkASSERT(unsortable);
             SkOpSpan* spanStart = start->starter(end);
             if (!spanStart->done()) {
                 if (!current->addCurveTo(start, end, simple)) {
                     return false;
                 }
                 current->markDone(spanStart);
             }
-            *closable = false;
         }
-        simple->close();
+        simple->finishContour();
         SkPathOpsDebug::ShowActiveSpans(contourList);
     }
     return true;
 }
 
 // FIXME : add this as a member of SkPath
 bool SimplifyDebug(const SkPath& path, SkPath* result
         SkDEBUGPARAMS(bool skipAssert) SkDEBUGPARAMS(const char* testName)) {
     // returns 1 for evenodd, -1 for winding, regardless of inverse-ness
     SkPath::FillType fillType = path.isInverseFillType() ? SkPath::kInverseEvenOdd_FillType
@@ skipping 17 matching lines @@
     const SkPath* workingPath;
     if (scaleFactor > SK_Scalar1) {
         ScalePath(path, 1.f / scaleFactor, &scaledPath);
         workingPath = &scaledPath;
     } else {
         workingPath = &path;
     }
 #if DEBUG_SORT
     SkPathOpsDebug::gSortCount = SkPathOpsDebug::gSortCountDefault;
 #endif
-    SkOpEdgeBuilder builder(*workingPath, &contour, &globalState);
+    SkOpEdgeBuilder builder(*workingPath, contourList, &globalState);
     if (!builder.finish()) {
         return false;
     }
 #if DEBUG_DUMP_SEGMENTS
     contour.dumpSegments();
 #endif
     if (!SortContourList(&contourList, false, false)) {
         result->reset();
         result->setFillType(fillType);
         return true;
@@ skipping 11 matching lines @@
     if (!HandleCoincidence(contourList, &coincidence)) {
         return false;
     }
 #if DEBUG_DUMP_ALIGNMENT
     contour.dumpSegments("aligned");
 #endif
     // construct closed contours
     result->reset();
     result->setFillType(fillType);
     SkPathWriter wrapper(*result);
-    bool closable SK_INIT_TO_AVOID_WARNING;
-    if (builder.xorMask() == kWinding_PathOpsMask
-            ? !bridgeWinding(contourList, &wrapper, &closable)
-            : !bridgeXor(contourList, &wrapper, &closable)) {
+    if (builder.xorMask() == kWinding_PathOpsMask ? !bridgeWinding(contourList, &wrapper)
+            : !bridgeXor(contourList, &wrapper)) {
         return false;
     }
-    if (!closable)
-    {  // if some edges could not be resolved, assemble remaining fragments
-        SkPath temp;
-        temp.setFillType(fillType);
-        SkPathWriter assembled(temp);
-        Assemble(wrapper, &assembled);
-        *result = *assembled.nativePath();
-        result->setFillType(fillType);
-    }
+    wrapper.assemble();  // if some edges could not be resolved, assemble remaining
     if (scaleFactor > 1) {
         ScalePath(*result, scaleFactor, result);
     }
     return true;
 }
 
 bool Simplify(const SkPath& path, SkPath* result) {
     return SimplifyDebug(path, result  SkDEBUGPARAMS(true) SkDEBUGPARAMS(nullptr));
 }