pathops coincident work

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 58 matching lines @@
         return fCoincidence;
     }
 
     SkOpContourHead* contourHead() {
         return fContourHead;
     }
 
 #ifdef SK_DEBUG
     const class SkOpAngle* debugAngle(int id) const;
     const SkOpCoincidence* debugCoincidence() const;
-    SkOpContour* debugContour(int id);
+    SkOpContour* debugContour(int id) const;
     const class SkOpPtT* debugPtT(int id) const;
     bool debugRunFail() const;
     const class SkOpSegment* debugSegment(int id) const;
     bool debugSkipAssert() const { return fDebugSkipAssert; }
     const class SkOpSpanBase* debugSpan(int id) const;
     const char* debugTestName() const { return fDebugTestName; }
 #endif
 
 #if DEBUG_T_SECT_LOOP_COUNT
     void debugAddLoopCount(SkIntersections* , const SkIntersectionHelper& ,
@@ skipping 100 matching lines @@
     SkPath::Verb fDebugWorstVerb[6];
     SkPoint fDebugWorstPts[24];
     float fDebugWorstWeight[6];
 #endif
 #if DEBUG_COINCIDENCE
     bool fDebugCheckHealth;
 #endif
 };
 
 #ifdef SK_DEBUG
+#if DEBUG_COINCIDENCE
 #define SkOPASSERT(cond) SkASSERT((this->globalState() && \
-        this->globalState()->debugSkipAssert()) || cond)
+        (this->globalState()->debugCheckHealth() || \
+        this->globalState()->debugSkipAssert())) || (cond))
+#else
+#define SkOPASSERT(cond) SkASSERT((this->globalState() && \
+        this->globalState()->debugSkipAssert()) || (cond))
+#endif
 #define SkOPOBJASSERT(obj, cond) SkASSERT((obj->debugGlobalState() && \
-        obj->debugGlobalState()->debugSkipAssert()) || cond)
+        obj->debugGlobalState()->debugSkipAssert()) || (cond))
 #else
 #define SkOPASSERT(cond)
 #define SkOPOBJASSERT(obj, cond)
 #endif
 
 // Use Almost Equal when comparing coordinates. Use epsilon to compare T values.
 bool AlmostEqualUlps(float a, float b);
 inline bool AlmostEqualUlps(double a, double b) {
     return AlmostEqualUlps(SkDoubleToScalar(a), SkDoubleToScalar(b));
 }
@@ skipping 308 matching lines @@
 
 inline bool roughly_between(double a, double b, double c) {
     return a <= c ? roughly_negative(a - b) && roughly_negative(b - c)
             : roughly_negative(b - a) && roughly_negative(c - b);
 }
 
 inline bool more_roughly_equal(double x, double y) {
     return fabs(x - y) < MORE_ROUGH_EPSILON;
 }
 
-inline bool way_roughly_equal(double x, double y) {
-    return fabs(x - y) < WAY_ROUGH_EPSILON;
-}
-
 struct SkDPoint;
 struct SkDVector;
 struct SkDLine;
 struct SkDQuad;
 struct SkDConic;
 struct SkDCubic;
 struct SkDRect;
 
 inline SkPath::Verb SkPathOpsPointsToVerb(int points) {
     int verb = (1 << points) >> 1;
@@ skipping 45 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