pathops coincidence and security rewrite

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 19 matching lines @@
 #ifdef SK_BUILD_FOR_WIN
     #define SK_SNPRINTF _snprintf
 #else
     #define SK_SNPRINTF snprintf
 #endif
 
 #define WIND_AS_STRING(x) char x##Str[12]; \
         if (!SkPathOpsDebug::ValidWind(x)) strcpy(x##Str, "?"); \
         else SK_SNPRINTF(x##Str, sizeof(x##Str), "%d", x)
 
+#define DEBUG_UNDER_DEVELOPMENT 01
+
 #if FORCE_RELEASE
 
 #define DEBUG_ACTIVE_OP 0
 #define DEBUG_ACTIVE_SPANS 0
 #define DEBUG_ADD_INTERSECTING_TS 0
 #define DEBUG_ADD_T 0
 #define DEBUG_ALIGNMENT 0
 #define DEBUG_ANGLE 0
 #define DEBUG_ASSEMBLE 0
 #define DEBUG_COINCIDENCE 0
+#define DEBUG_COINCIDENCE_VERBOSE 0
 #define DEBUG_CUBIC_BINARY_SEARCH 0
 #define DEBUG_CUBIC_SPLIT 0
 #define DEBUG_DUMP_SEGMENTS 0
 #define DEBUG_FLOW 0
 #define DEBUG_LIMIT_WIND_SUM 0
 #define DEBUG_MARK_DONE 0
 #define DEBUG_PATH_CONSTRUCTION 0
 #define DEBUG_PERP 0
 #define DEBUG_SHOW_TEST_NAME 0
 #define DEBUG_SORT 0
 #define DEBUG_T_SECT 0
 #define DEBUG_T_SECT_DUMP 0
 #define DEBUG_T_SECT_LOOP_COUNT 0
 #define DEBUG_VALIDATE 0
 #define DEBUG_WINDING 0
 #define DEBUG_WINDING_AT_T 0
 
 
 #else
 
 #define DEBUG_ACTIVE_OP 1
 #define DEBUG_ACTIVE_SPANS 1
 #define DEBUG_ADD_INTERSECTING_TS 1
 #define DEBUG_ADD_T 1
 #define DEBUG_ALIGNMENT 0
 #define DEBUG_ANGLE 1
 #define DEBUG_ASSEMBLE 1
-#define DEBUG_COINCIDENCE 0
+#define DEBUG_COINCIDENCE 01
+#define DEBUG_COINCIDENCE_VERBOSE 01
 #define DEBUG_CUBIC_BINARY_SEARCH 0
 #define DEBUG_CUBIC_SPLIT 1
 #define DEBUG_DUMP_SEGMENTS 1
 #define DEBUG_FLOW 1
-#define DEBUG_LIMIT_WIND_SUM 5
+#define DEBUG_LIMIT_WIND_SUM 15
 #define DEBUG_MARK_DONE 1
 #define DEBUG_PATH_CONSTRUCTION 1
 #define DEBUG_PERP 1
 #define DEBUG_SHOW_TEST_NAME 1
 #define DEBUG_SORT 1
 #define DEBUG_T_SECT 0
 #define DEBUG_T_SECT_DUMP 0
 #define DEBUG_T_SECT_LOOP_COUNT 0
 #define DEBUG_VALIDATE 1
 #define DEBUG_WINDING 1
@@ skipping 86 matching lines @@
 
 #if DEBUG_SHOW_TEST_NAME
     static void* CreateNameStr();
     static void DeleteNameStr(void* v);
 #define DEBUG_FILENAME_STRING_LENGTH 64
 #define DEBUG_FILENAME_STRING (reinterpret_cast<char* >(SkTLS::Get(SkPathOpsDebug::CreateNameStr, \
         SkPathOpsDebug::DeleteNameStr)))
     static void BumpTestName(char* );
 #endif
     static const char* OpStr(SkPathOp );
+    static void ShowActiveSpans(SkOpContourHead* contourList);
     static void ShowOnePath(const SkPath& path, const char* name, bool includeDeclaration);
     static void ShowPath(const SkPath& one, const SkPath& two, SkPathOp op, const char* name);
 
     static bool ChaseContains(const SkTDArray<class SkOpSpanBase*>& , const class SkOpSpanBase* );
 
     static void CheckHealth(class SkOpContourHead* contourList, const char* id);
 
-    static const struct SkOpAngle* DebugAngleAngle(const struct SkOpAngle*, int id);
-    static class SkOpContour* DebugAngleContour(struct SkOpAngle*, int id);
-    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 class SkOpAngle* DebugAngleAngle(const class SkOpAngle*, int id);
+    static class SkOpContour* DebugAngleContour(class SkOpAngle*, int id);
+    static const class SkOpPtT* DebugAnglePtT(const class SkOpAngle*, int id);
+    static const class SkOpSegment* DebugAngleSegment(const class SkOpAngle*, int id);
+    static const class SkOpSpanBase* DebugAngleSpan(const class SkOpAngle*, int id);
 
-    static const struct SkOpAngle* DebugContourAngle(class SkOpContour*, int id);
+    static const class 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 const class 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 const class 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 const class 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 const class 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