pathops coincidence and security rewrite

tests/PathOpsDebug.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 "PathOpsTSectDebug.h"
 #include "SkOpCoincidence.h"
 #include "SkOpContour.h"
@@ skipping 32 matching lines @@
 
 void SkPathOpsDebug::WindingPrintf(int wind) {
     if (wind == SK_MinS32) {
         SkDebugf("?");
     } else {
         SkDebugf("%d", wind);
     }
 }
 #endif
 
+static void DumpID(int id) {
+    SkDebugf("} ");
+    if (id >= 0) {
+        SkDebugf("id=%d", id);
+    }
+    SkDebugf("\n");
+}
+
 void SkDConic::dump() const {
     dumpInner();
     SkDebugf("},\n");
 }
 
 void SkDConic::dumpID(int id) const {
     dumpInner();
-    SkDebugf("} id=%d\n", id);
+    DumpID(id);
 }
 
 void SkDConic::dumpInner() const {
     SkDebugf("{");
     fPts.dumpInner();
     SkDebugf("}}, %1.9gf", fWeight);
 }
 
 void SkDCubic::dump() const {
     this->dumpInner();
     SkDebugf("}},\n");
 }
 
 void SkDCubic::dumpID(int id) const {
     this->dumpInner();
-    SkDebugf("}} id=%d\n", id);
+    SkDebugf("}");
+    DumpID(id);
 }
 
 static inline bool double_is_NaN(double x) { return x != x; }
 
 void SkDCubic::dumpInner() const {
     SkDebugf("{{");
     int index = 0;
     do {
         if (index != 0) {
             if (double_is_NaN(fPts[index].fX) && double_is_NaN(fPts[index].fY)) {
                 return;
             }
             SkDebugf(", ");
         }
         fPts[index].dump();
     } while (++index < 3);
     if (double_is_NaN(fPts[index].fX) && double_is_NaN(fPts[index].fY)) {
         return;
     }
     SkDebugf(", ");
     fPts[index].dump();
 }
 
+void SkDCurve::dump() const {
+    dumpID(-1);
+}
+
 void SkDCurve::dumpID(int id) const {
 #ifndef SK_RELEASE
     switch(fVerb) {
         case SkPath::kLine_Verb:
             fLine.dumpID(id);
             break;
         case SkPath::kQuad_Verb:
             fQuad.dumpID(id);
             break;
         case SkPath::kConic_Verb:
@@ skipping 10 matching lines @@
 #endif
 }
 
 void SkDLine::dump() const {
     this->dumpInner();
     SkDebugf("}},\n");
 }
 
 void SkDLine::dumpID(int id) const {
     this->dumpInner();
-    SkDebugf("}} id=%d\n", id);
+    SkDebugf("}");
+    DumpID(id);
 }
 
 void SkDLine::dumpInner() const {
     SkDebugf("{{");
     fPts[0].dump();
     SkDebugf(", ");
     fPts[1].dump();
 }
 
 void SkDPoint::dump() const {
@@ skipping 20 matching lines @@
     SkDebugf("}");
 }
 
 void SkDQuad::dump() const {
     dumpInner();
     SkDebugf("}},\n");
 }
 
 void SkDQuad::dumpID(int id) const {
     dumpInner();
-    SkDebugf("}} id=%d\n", id);
+    SkDebugf("}");
+    DumpID(id);
 }
 
 void SkDQuad::dumpInner() const {
     SkDebugf("{{");
     int index = 0;
     do {
         fPts[index].dump();
         SkDebugf(", ");
     } while (++index < 2);
     fPts[index].dump();
@@ skipping 598 matching lines @@
 
 void DumpT(const SkDQuad& quad, double t) {
     SkDLine line = {{quad.ptAtT(t), quad[0]}};
     line.dump();
 }
 
 const SkOpAngle* SkOpAngle::debugAngle(int id) const {
     return this->segment()->debugAngle(id);
 }
 
+const SkOpCoincidence* SkOpAngle::debugCoincidence() const {
+    return this->segment()->debugCoincidence();
+}
+
 SkOpContour* SkOpAngle::debugContour(int id) {
     return this->segment()->debugContour(id);
 }
 
 const SkOpPtT* SkOpAngle::debugPtT(int id) const {
     return this->segment()->debugPtT(id);
 }
 
 const SkOpSegment* SkOpAngle::debugSegment(int id) const {
     return this->segment()->debugSegment(id);
@@ skipping 118 matching lines @@
 }
 
 const SkOpAngle* SkOpPtT::debugAngle(int id) const {
     return this->span()->debugAngle(id);
 }
 
 SkOpContour* SkOpPtT::debugContour(int id) {
     return this->span()->debugContour(id);
 }
 
+const SkOpCoincidence* SkOpPtT::debugCoincidence() const {
+    return this->span()->debugCoincidence();
+}
+
 const SkOpPtT* SkOpPtT::debugPtT(int id) const {
     return this->span()->debugPtT(id);
 }
 
 const SkOpSegment* SkOpPtT::debugSegment(int id) const {
     return this->span()->debugSegment(id);
 }
 
 const SkOpSpanBase* SkOpPtT::debugSpan(int id) const {
     return this->span()->debugSpan(id);
@@ skipping 19 matching lines @@
         SkDebugf("\n");
         if (limit && ++loop >= limit) {
             SkDebugf("*** abort loop ***\n");
             break;
         }
     } while ((next = next->fNext) && next != this);
     contour()->outdentDump();
 }
 
 void SkOpPtT::dumpBase() const {
-    SkDebugf(" t=%1.9g pt=(%1.9g,%1.9g)%s%s", this->fT, this->fPt.fX, this->fPt.fY,
+    SkDebugf(" t=%1.9g pt=(%1.9g,%1.9g)%s%s%s", this->fT, this->fPt.fX, this->fPt.fY,
+            this->fCoincident ? " coin" : "",
             this->fDuplicatePt ? " dup" : "", this->fDeleted ? " deleted" : "");
 }
 
 const SkOpAngle* SkOpSpanBase::debugAngle(int id) const {
     return this->segment()->debugAngle(id);
 }
 
+const SkOpCoincidence* SkOpSpanBase::debugCoincidence() const {
+    return this->segment()->debugCoincidence();
+}
+
 SkOpContour* SkOpSpanBase::debugContour(int id) {
     return this->segment()->debugContour(id);
 }
 
 const SkOpPtT* SkOpSpanBase::debugPtT(int id) const {
     return this->segment()->debugPtT(id);
 }
 
 const SkOpSegment* SkOpSpanBase::debugSegment(int id) const {
     return this->segment()->debugSegment(id);
 }
 
 const SkOpSpanBase* SkOpSpanBase::debugSpan(int id) const {
     return this->segment()->debugSpan(id);
 }
 
 void SkOpSpanBase::dump() const {
-    this->dumpAll();
+    this->dumpHead();
+    this->fPtT.dump();
+}
+
+void SkOpSpanBase::dumpHead() const {
+    SkDebugf("%.*s", contour()->debugIndent(), "        ");
+    SkDebugf("seg=%d span=%d", this->segment()->debugID(), this->debugID());
+    this->dumpBase();
     SkDebugf("\n");
 }
 
 void SkOpSpanBase::dumpAll() const {
-    SkDebugf("%.*s", contour()->debugIndent(), "        ");
-    SkDebugf("seg=%d span=%d", this->segment()->debugID(), this->debugID());
-    this->dumpBase();
-    SkDebugf("\n");
+    this->dumpHead();
     this->fPtT.dumpAll();
 }
 
 void SkOpSpanBase::dumpBase() const {
     if (this->fAligned) {
         SkDebugf(" aligned");
     }
     if (this->fChased) {
         SkDebugf(" chased");
     }
+#ifdef SK_DEBUG
+    if (this->fDeleted) {
+        SkDebugf(" deleted");
+    }
+#endif
     if (!this->final()) {
         this->upCast()->dumpSpan();
     }
     const SkOpSpanBase* coin = this->coinEnd();
     if (this != coin) {
         SkDebugf(" coinEnd seg/span=%d/%d", coin->segment()->debugID(), coin->debugID());
     } else if (this->final() || !this->upCast()->isCoincident()) {
         const SkOpPtT* oPt = this->ptT()->next();
         SkDebugf(" seg/span=%d/%d", oPt->segment()->debugID(), oPt->span()->debugID());
     }
@@ skipping 41 matching lines @@
     if (this->done()) {
         SkDebugf(" done");
     }
     return this != coin;
 }
 
 const SkOpAngle* SkOpSegment::debugAngle(int id) const {
     return this->contour()->debugAngle(id);
 }
 
+
+const SkOpCoincidence* SkOpSegment::debugCoincidence() const {
+    return this->contour()->debugCoincidence();
+}
+
 SkOpContour* SkOpSegment::debugContour(int id) {
     return this->contour()->debugContour(id);
 }
 
 const SkOpPtT* SkOpSegment::debugPtT(int id) const {
     return this->contour()->debugPtT(id);
 }
 
 const SkOpSegment* SkOpSegment::debugSegment(int id) const {
     return this->contour()->debugSegment(id);
@@ skipping 99 matching lines @@
     if (fOppPtTStart->segment()->isXor()) {
         SkDebugf(" xor");
     }
     SkDebugf("\n");
 }
 
 void SkOpCoincidence::dump() const {
     SkCoincidentSpans* span = fHead;
     while (span) {
         span->dump();
-        span = span->fNext;
+        span = span->next();
     }
     if (!fTop || fHead == fTop) {
         return;
     }
     SkDebugf("top:\n");
     span = fTop;
-    if (fHead) {
-        span->dump();
-        return;
-    }
+    int count = 0;
     while (span) {
         span->dump();
-        span = span->fNext;
+        span = span->next();
+        SkCoincidentSpans* check = fTop;
+        ++count;
+        for (int index = 0; index < count; ++index) {
+            if (span == check) {
+                SkDebugf("(loops to #%d)\n", index);
+                return;
+            }
+            check = check->next();
+        }
     }
 }
 
 void SkOpContour::dump() const {
     SkDebugf("contour=%d count=%d op=%d xor=%d\n", this->debugID(), fCount, fOperand, fXor);
     if (!fCount) {
         return;
     }
     const SkOpSegment* segment = &fHead;
     SkDEBUGCODE(fDebugIndent = 0);
@@ skipping 191 matching lines @@
             segment = segment->next();
         }
     } while ((contour = contour->next()));
     return nullptr;
 }
 #endif
 
 #if DEBUG_T_SECT_DUMP > 1
 int gDumpTSectNum;
 #endif