fix builder winding again

src/pathops/SkOpBuilder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMatrix.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkPath.h"
@@ skipping 37 matching lines @@
     SkOpEdgeBuilder builder(*path, &contourHead, &allocator, &globalState);
     builder.finish(&allocator);
     SkASSERT(contourHead.next());
     contourHead.resetReverse();
     bool writePath = false;
     SkOpSpan* topSpan;
     globalState.setPhase(SkOpGlobalState::kFixWinding);
     while ((topSpan = FindSortableTop(&contourHead))) {
         SkOpSegment* topSegment = topSpan->segment();
         SkOpContour* topContour = topSegment->contour();
-        bool active = topSegment->activeWinding(topSpan, topSpan->next());
         SkASSERT(topContour->isCcw() >= 0);
-        if (active != SkToBool(topContour->isCcw())) {
+#if DEBUG_WINDING
+        SkDebugf("%s id=%d nested=%d ccw=%d\n",  __FUNCTION__,
+                topSegment->debugID(), globalState.nested(), topContour->isCcw());
+#endif
+        if ((globalState.nested() & 1) != SkToBool(topContour->isCcw())) {
             topContour->setReverse();
             writePath = true;
         }
         topContour->markDone();
+        globalState.clearNested();
     }
     if (!writePath) {
         path->setFillType(fillType);
         return;
     }
     SkPath empty;
     SkPathWriter woundPath(empty);
     SkOpContour* test = &contourHead;
     do {
         if (test->reversed()) {
@@ skipping 83 matching lines @@
         FixWinding(&fPathRefs[index]);
         sum.addPath(fPathRefs[index]);
     }
     reset();
     bool success = Simplify(sum, result);
     if (!success) {
         *result = original;
     }
     return success;
 }