pathops coincident fixes

src/pathops/SkPathOpsDebug.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPathOpsDebug_DEFINED
 #define SkPathOpsDebug_DEFINED
 
 #include "SkPathOps.h"
@@ skipping 77 matching lines @@
 #ifdef SK_RELEASE
     #define SkDEBUGRELEASE(a, b) b
     #define SkDEBUGPARAMS(...)
     #define SkDEBUGCODE_(...)
 #else
     #define SkDEBUGRELEASE(a, b) a
     #define SkDEBUGPARAMS(...) , __VA_ARGS__
     #define SkDEBUGCODE_(...) __VA_ARGS__  // temporary until SkDEBUGCODE is fixed
 #endif
 
+#if DEBUG_VALIDATE == 0
+    #define PATH_OPS_DEBUG_VALIDATE_PARAMS(...)
+#else
+    #define PATH_OPS_DEBUG_VALIDATE_PARAMS(...) , __VA_ARGS__
+#endif
+
 #if DEBUG_T_SECT == 0
     #define PATH_OPS_DEBUG_T_SECT_RELEASE(a, b) b
     #define PATH_OPS_DEBUG_T_SECT_PARAMS(...)
     #define PATH_OPS_DEBUG_T_SECT_CODE(...)
 #else
     #define PATH_OPS_DEBUG_T_SECT_RELEASE(a, b) a
     #define PATH_OPS_DEBUG_T_SECT_PARAMS(...) , __VA_ARGS__
     #define PATH_OPS_DEBUG_T_SECT_CODE(...) __VA_ARGS__
 #endif
 
@@ skipping 64 matching lines @@
     static const class SkOpPtT* DebugAnglePtT(const struct SkOpAngle*, int id);
     static const class SkOpSegment* DebugAngleSegment(const struct SkOpAngle*, int id);
     static const class SkOpSpanBase* DebugAngleSpan(const struct SkOpAngle*, int id);
 
     static const struct SkOpAngle* DebugContourAngle(class SkOpContour*, int id);
     static class SkOpContour* DebugContourContour(class SkOpContour*, int id);
     static const class SkOpPtT* DebugContourPtT(class SkOpContour*, int id);
     static const class SkOpSegment* DebugContourSegment(class SkOpContour*, int id);
     static const class SkOpSpanBase* DebugContourSpan(class SkOpContour*, int id);
 
+    static const struct SkOpAngle* DebugCoincidenceAngle(class SkOpCoincidence*, int id);
+    static class SkOpContour* DebugCoincidenceContour(class SkOpCoincidence*, int id);
+    static const class SkOpPtT* DebugCoincidencePtT(class SkOpCoincidence*, int id);
+    static const class SkOpSegment* DebugCoincidenceSegment(class SkOpCoincidence*, int id);
+    static const class SkOpSpanBase* DebugCoincidenceSpan(class SkOpCoincidence*, int id);
+
     static const struct SkOpAngle* DebugPtTAngle(const class SkOpPtT*, int id);
     static class SkOpContour* DebugPtTContour(class SkOpPtT*, int id);
     static const class SkOpPtT* DebugPtTPtT(const class SkOpPtT*, int id);
     static const class SkOpSegment* DebugPtTSegment(const class SkOpPtT*, int id);
     static const class SkOpSpanBase* DebugPtTSpan(const class SkOpPtT*, int id);
 
     static const struct SkOpAngle* DebugSegmentAngle(const class SkOpSegment*, int id);
     static class SkOpContour* DebugSegmentContour(class SkOpSegment*, int id);
     static const class SkOpPtT* DebugSegmentPtT(const class SkOpSegment*, int id);
     static const class SkOpSegment* DebugSegmentSegment(const class SkOpSegment*, int id);
     static const class SkOpSpanBase* DebugSegmentSpan(const class SkOpSegment*, int id);
 
     static const struct SkOpAngle* DebugSpanAngle(const class SkOpSpanBase*, int id);
     static class SkOpContour* DebugSpanContour(class SkOpSpanBase*, int id);
     static const class SkOpPtT* DebugSpanPtT(const class SkOpSpanBase*, int id);
     static const class SkOpSegment* DebugSpanSegment(const class SkOpSpanBase*, int id);
     static const class SkOpSpanBase* DebugSpanSpan(const class SkOpSpanBase*, int id);
 };
 
 struct SkDQuad;
 
 // generates tools/path_sorter.htm and path_visualizer.htm compatible data
 void DumpQ(const SkDQuad& quad1, const SkDQuad& quad2, int testNo);
 void DumpT(const SkDQuad& quad, double t);
 
 #endif