pathops coincident work

src/pathops/SkOpSegment.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 SkOpSegment_DEFINE
 #define SkOpSegment_DEFINE
 
 #include "SkOpAngle.h"
@@ skipping 90 matching lines @@
     const SkPathOpsBounds& bounds() const {
         return fBounds;
     }
 
     void bumpCount() {
         ++fCount;
     }
 
     void calcAngles();
     bool collapsed() const;
+    bool collapsed(double startT, double endT) const;
     static void ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,
                               SkOpAngle::IncludeType );
     static void ComputeOneSumReverse(SkOpAngle* baseAngle, SkOpAngle* nextAngle,
                                      SkOpAngle::IncludeType );
     int computeSum(SkOpSpanBase* start, SkOpSpanBase* end, SkOpAngle::IncludeType includeType);
 
     void clearAll();
     void clearOne(SkOpSpan* span);
     static void ClearVisited(SkOpSpanBase* span);
     bool contains(double t) const;
 
     SkOpContour* contour() const {
         return fContour;
     }
 
     int count() const {
         return fCount;
     }
 
     void debugAddAngle(double startT, double endT);
-    const SkOpPtT* debugAddT(double t) const;
+#if DEBUG_COINCIDENCE_VERBOSE
+    const SkOpPtT* debugAddT(double t, const char* id, SkPathOpsDebug::GlitchLog* ) const;
+#endif
     const SkOpAngle* debugAngle(int id) const;
 #if DEBUG_ANGLE
     void debugCheckAngleCoin() const;
 #endif
 #if DEBUG_COINCIDENCE_VERBOSE
     void debugCheckHealth(const char* id, SkPathOpsDebug::GlitchLog* ) const;
     void debugClearAll(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
     void debugClearOne(const SkOpSpan* span, const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
 #endif
     const SkOpCoincidence* debugCoincidence() const;
-    SkOpContour* debugContour(int id);
+    SkOpContour* debugContour(int id) const;
 
     int debugID() const {
         return SkDEBUGRELEASE(fID, -1);
     }
 
     SkOpAngle* debugLastAngle();
 #if DEBUG_COINCIDENCE_VERBOSE
     void debugMissingCoincidence(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
     void debugMoveMultiples(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
     void debugMoveNearby(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
@@ skipping 295 matching lines @@
     mutable SkScalar fDebugBaseMin;  // if > 0, the 1st t value in this seg vis-a-vis the ref seg
     mutable SkScalar fDebugBaseMax;
     mutable int fDebugLastIndex;
     mutable SkScalar fDebugLastMin;  // if > 0, the last t -- next t val - base has same sign
     mutable SkScalar fDebugLastMax;
 #endif
     SkDEBUGCODE(int fID);
 };
 
 #endif