fix builder winding again

src/pathops/SkPathOpsTypes.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPathOpsTypes_DEFINED
 #define SkPathOpsTypes_DEFINED
 
 #include <float.h>  // for FLT_EPSILON
@@ skipping 13 matching lines @@
 
 class SkOpCoincidence;
 class SkOpContour;
 class SkOpContourHead;
 
 class SkOpGlobalState {
 public:
     SkOpGlobalState(SkOpCoincidence* coincidence, SkOpContourHead* head)
         : fCoincidence(coincidence)
         , fContourHead(head)
+        , fNested(0)
         , fWindingFailed(false)
         , fAngleCoincidence(false)
         , fPhase(kIntersecting)
         SkDEBUGPARAMS(fAngleID(0))
         SkDEBUGPARAMS(fContourID(0))
         SkDEBUGPARAMS(fPtTID(0))
         SkDEBUGPARAMS(fSegmentID(0))
         SkDEBUGPARAMS(fSpanID(0)) {
     }
 
     enum Phase {
         kIntersecting,
         kWalking,
         kFixWinding,
     };
 
     enum {
         kMaxWindingTries = 10
     };
 
     bool angleCoincidence() {
         return fAngleCoincidence;
     }
 
+    void bumpNested() {
+        ++fNested;
+    }
+
+    void clearNested() {
+        fNested = 0;
+    }
+
     SkOpCoincidence* coincidence() {
         return fCoincidence;
     }
 
     SkOpContourHead* contourHead() {
         return fContourHead;
     }
 
 #ifdef SK_DEBUG
     const struct SkOpAngle* debugAngle(int id) const;
     SkOpContour* debugContour(int id);
     const class SkOpPtT* debugPtT(int id) const;
     const class SkOpSegment* debugSegment(int id) const;
     const class SkOpSpanBase* debugSpan(int id) const;
+#endif
 
+    int nested() const {
+        return fNested;
+    }
+
+#ifdef SK_DEBUG
     int nextAngleID() {
         return ++fAngleID;
     }
 
     int nextContourID() {
         return ++fContourID;
     }
     int nextPtTID() {
         return ++fPtTID;
     }
@@ skipping 29 matching lines @@
         fWindingFailed = true;
     }
 
     bool windingFailed() const {
         return fWindingFailed;
     }
 
 private:
     SkOpCoincidence* fCoincidence;
     SkOpContourHead* fContourHead;
+    int fNested;
     bool fWindingFailed;
     bool fAngleCoincidence;
     Phase fPhase;
 #ifdef SK_DEBUG
     int fAngleID;
     int fContourID;
     int fPtTID;
     int fSegmentID;
     int fSpanID;
 #endif
@@ skipping 364 matching lines @@
 */
 inline int SkDSideBit(double x) {
     return 1 << SKDSide(x);
 }
 
 inline double SkPinT(double t) {
     return precisely_less_than_zero(t) ? 0 : precisely_greater_than_one(t) ? 1 : t;
 }
 
 #endif