fix winding for path ops builder

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 15 matching lines @@
 class SkOpContour;
 class SkOpContourHead;
 
 class SkOpGlobalState {
 public:
     SkOpGlobalState(SkOpCoincidence* coincidence, SkOpContourHead* head)
         : fCoincidence(coincidence)
         , fContourHead(head)
         , fWindingFailed(false)
         , fAngleCoincidence(false)
-#if DEBUG_VALIDATE
         , fPhase(kIntersecting)
-#endif
         SkDEBUGPARAMS(fAngleID(0))
         SkDEBUGPARAMS(fContourID(0))
         SkDEBUGPARAMS(fPtTID(0))
         SkDEBUGPARAMS(fSegmentID(0))
         SkDEBUGPARAMS(fSpanID(0)) {
     }
 
-#if DEBUG_VALIDATE
     enum Phase {
         kIntersecting,
-        kWalking
+        kWalking,
+        kFixWinding,
     };
-#endif
 
     enum {
         kMaxWindingTries = 10
     };
 
     bool angleCoincidence() {
         return fAngleCoincidence;
     }
 
     SkOpCoincidence* coincidence() {
@@ skipping 24 matching lines @@
 
     int nextSegmentID() {
         return ++fSegmentID;
     }
 
     int nextSpanID() {
         return ++fSpanID;
     }
 #endif
 
-#if DEBUG_VALIDATE
     Phase phase() const {
         return fPhase;
     }
-#endif
 
     void setAngleCoincidence() {
         fAngleCoincidence = true;
     }
     
     void setContourHead(SkOpContourHead* contourHead) {
         fContourHead = contourHead;
     }
 
-#if DEBUG_VALIDATE
     void setPhase(Phase phase) {
         SkASSERT(fPhase != phase);
         fPhase = phase;
     }
-#endif
 
     // called in very rare cases where angles are sorted incorrectly -- signfies op will fail
     void setWindingFailed() {
         fWindingFailed = true;
     }
 
     bool windingFailed() const {
         return fWindingFailed;
     }
 
 private:
     SkOpCoincidence* fCoincidence;
     SkOpContourHead* fContourHead;
     bool fWindingFailed;
     bool fAngleCoincidence;
-#if DEBUG_VALIDATE
     Phase fPhase;
-#endif
 #ifdef SK_DEBUG
     int fAngleID;
     int fContourID;
     int fPtTID;
     int fSegmentID;
     int fSpanID;
 #endif
 };
 
 // Use Almost Equal when comparing coordinates. Use epsilon to compare T values.
@@ skipping 361 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