fix tiger b

src/pathops/SkPathOpsDebug.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMutex.h"
 #include "SkOpCoincidence.h"
 #include "SkOpContour.h"
@@ skipping 353 matching lines @@
             case kMoveNearbyReleaseFinal_Glitch: SkDebugf(" MoveNearbyReleaseFinal"); break;
             case kReleasedSpan_Glitch: SkDebugf(" ReleasedSpan"); break;
             case kUnaligned_Glitch: SkDebugf(" Unaligned"); break;
             case kUnalignedHead_Glitch: SkDebugf(" UnalignedHead"); break;
             case kUnalignedTail_Glitch: SkDebugf(" UnalignedTail"); break;
             default: SkASSERT(0);
         }
         SkDebugf("\n");
     }
     contourList->globalState()->debugSetCheckHealth(false);
-#if 0 && DEBUG_ACTIVE_SPANS
+#if 01 && DEBUG_ACTIVE_SPANS
     SkDebugf("active after %s:\n", id);
     ShowActiveSpans(contourList);
 #endif
 #endif
 }
 #endif
 
 #if defined SK_DEBUG || !FORCE_RELEASE
 void SkPathOpsDebug::MathematicaIze(char* str, size_t bufferLen) {
     size_t len = strlen(str);
@@ skipping 1454 matching lines @@
 }
 
 // Commented-out lines keep this in sync with markCollapsed()
 void SkOpCoincidence::debugMarkCollapsed(const char* id, SkPathOpsDebug::GlitchLog* log, const SkOpPtT* test) const {
     this->debugMarkCollapsed(id, log, fHead, test);
     this->debugMarkCollapsed(id, log, fTop, test);
 }
 #endif
 
 void SkCoincidentSpans::debugShow() const {
-    SkDebugf("%s - id=%d t=%1.9g tEnd=%1.9g\n", __FUNCTION__,
-            coinPtTStart()->segment()->debugID(),
+    SkDebugf("coinSpan - id=%d t=%1.9g tEnd=%1.9g\n", coinPtTStart()->segment()->debugID(),
             coinPtTStart()->fT, coinPtTEnd()->fT);
-    SkDebugf("%s + id=%d t=%1.9g tEnd=%1.9g\n", __FUNCTION__,
-            oppPtTStart()->segment()->debugID(),
+    SkDebugf("coinSpan + id=%d t=%1.9g tEnd=%1.9g\n", oppPtTStart()->segment()->debugID(),
             oppPtTStart()->fT, oppPtTEnd()->fT);
 }
 
 void SkOpCoincidence::debugShowCoincidence() const {
 #if DEBUG_COINCIDENCE
     const SkCoincidentSpans* span = fHead;
     while (span) {
         span->debugShow();
         span = span->next();
     }
 #endif
 }
 
 #if DEBUG_COINCIDENCE
-static void DebugValidate(const SkOpSpanBase* next, const SkOpSpanBase* end,
+static void DebugCheckBetween(const SkOpSpanBase* next, const SkOpSpanBase* end,
         double oStart, double oEnd, const SkOpSegment* oSegment,
         const char* id, SkPathOpsDebug::GlitchLog* log) {
     SkASSERT(next != end);
     SkASSERT(!next->contains(end) || log);
     if (next->t() > end->t()) {
         SkTSwap(next, end);
     }
     do {
         const SkOpPtT* ptT = next->ptT();
         int index = 0;
@@ skipping 100 matching lines @@
         const char* id, SkPathOpsDebug::GlitchLog* log) {
     // look for pts inside coincident spans that are not inside the opposite spans
     const SkCoincidentSpans* coin = head;
     while (coin) {
         SkASSERT(SkOpCoincidence::Ordered(coin->coinPtTStart()->segment(),
                 coin->oppPtTStart()->segment()));
         SkASSERT(coin->coinPtTStart()->span()->ptT() == coin->coinPtTStart());
         SkASSERT(coin->coinPtTEnd()->span()->ptT() == coin->coinPtTEnd());
         SkASSERT(coin->oppPtTStart()->span()->ptT() == coin->oppPtTStart());
         SkASSERT(coin->oppPtTEnd()->span()->ptT() == coin->oppPtTEnd());
-        DebugValidate(coin->coinPtTStart()->span(), coin->coinPtTEnd()->span(),
+        coin = coin->next();
+    }
+    DebugCheckOverlapTop(head, opt, id, log);
+}
+#endif
+
+void SkOpCoincidence::debugValidate() const {
+#if DEBUG_COINCIDENCE
+    DebugValidate(fHead, fTop, nullptr, nullptr);
+    DebugValidate(fTop, nullptr, nullptr, nullptr);
+#endif
+}
+
+#if DEBUG_COINCIDENCE
+static void DebugCheckBetween(const SkCoincidentSpans* head, const SkCoincidentSpans* opt,
+        const char* id, SkPathOpsDebug::GlitchLog* log) {
+    // look for pts inside coincident spans that are not inside the opposite spans
+    const SkCoincidentSpans* coin = head;
+    while (coin) {
+        DebugCheckBetween(coin->coinPtTStart()->span(), coin->coinPtTEnd()->span(),
                 coin->oppPtTStart()->fT, coin->oppPtTEnd()->fT, coin->oppPtTStart()->segment(),
                 id, log);
-        DebugValidate(coin->oppPtTStart()->span(), coin->oppPtTEnd()->span(),
+        DebugCheckBetween(coin->oppPtTStart()->span(), coin->oppPtTEnd()->span(),
                 coin->coinPtTStart()->fT, coin->coinPtTEnd()->fT, coin->coinPtTStart()->segment(),
                 id, log);
         coin = coin->next();
     }
     DebugCheckOverlapTop(head, opt, id, log);
 }
 #endif
 
-void SkOpCoincidence::debugValidate() const {
+void SkOpCoincidence::debugCheckBetween() const {
 #if DEBUG_COINCIDENCE
- //   if (fGlobalState->debugCheckHealth()) {
-//        return;
-//    }
-    DebugValidate(fHead, fTop, nullptr, nullptr);
-    DebugValidate(fTop, nullptr, nullptr, nullptr);
+    if (fGlobalState->debugCheckHealth()) {
+        return;
+    }
+    DebugCheckBetween(fHead, fTop, nullptr, nullptr);
+    DebugCheckBetween(fTop, nullptr, nullptr, nullptr);
 #endif
 }
 
 #if DEBUG_COINCIDENCE_VERBOSE
 void SkOpCoincidence::debugCheckValid(const char* id, SkPathOpsDebug::GlitchLog* log) const {
     DebugValidate(fHead, fTop, id, log);
     DebugValidate(fTop, nullptr, id, log);
 }
 #endif
 
@@ skipping 619 matching lines @@
 #endif
     SkPath::FillType fillType = path.getFillType();
     SkASSERT(fillType >= SkPath::kWinding_FillType && fillType <= SkPath::kInverseEvenOdd_FillType);
     if (includeDeclaration) {
         SkDebugf("    SkPath %s;\n", name);
     }
     SkDebugf("    %s.setFillType(SkPath::%s);\n", name, gFillTypeStr[fillType]);
     iter.setPath(path);
     showPathContours(iter, name);
 }