update pathops to circle sort

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 13 matching lines @@
     #define SK_RAND(seed) rand()
 #else
     #define SK_RAND(seed) rand_r(&seed)
 #endif
 #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)
+
 #if FORCE_RELEASE
 
 #define DEBUG_ACTIVE_OP 0
 #define DEBUG_ACTIVE_SPANS 0
 #define DEBUG_ACTIVE_SPANS_FIRST_ONLY 0
 #define DEBUG_ACTIVE_SPANS_SHORT_FORM 1
 #define DEBUG_ADD_INTERSECTING_TS 0
 #define DEBUG_ADD_T_PAIR 0
 #define DEBUG_ANGLE 0
 #define DEBUG_AS_C_CODE 1
@@ skipping 70 matching lines @@
 #define TX_DEBUG_STR(t) #t "[%d]=%1.9g"
 #define CUBIC_DEBUG_DATA(c) c[0].fX, c[0].fY, c[1].fX, c[1].fY, c[2].fX, c[2].fY, c[3].fX, c[3].fY
 #define QUAD_DEBUG_DATA(q)  q[0].fX, q[0].fY, q[1].fX, q[1].fY, q[2].fX, q[2].fY
 #define LINE_DEBUG_DATA(l)  l[0].fX, l[0].fY, l[1].fX, l[1].fY
 #define PT_DEBUG_DATA(i, n) i.pt(n).fX, i.pt(n).fY
 
 #ifndef DEBUG_TEST
 #define DEBUG_TEST 0
 #endif
 
-#if defined SK_DEBUG || !FORCE_RELEASE
-
 #if DEBUG_SHOW_TEST_NAME
 #include "SkTLS.h"
 #endif
 
 #include "SkTArray.h"
+#include "SkTDArray.h"
 
 class SkPathOpsDebug {
 public:
     static int gMaxWindSum;
     static int gMaxWindValue;
 
     static const char* kLVerbStr[];
     static int gContourID;
     static int gSegmentID;
 
 #if DEBUG_SORT || DEBUG_SWAP_TOP
     static int gSortCountDefault;
     static int gSortCount;
 #endif
 
 #if DEBUG_ACTIVE_OP
     static const char* kPathOpStr[];
 #endif
 
+    static bool ChaseContains(const SkTDArray<struct SkOpSpan *>& , const struct SkOpSpan * );
     static void MathematicaIze(char* str, size_t bufferSize);
     static bool ValidWind(int winding);
     static void WindingPrintf(int winding);
 
 #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 void ShowPath(const SkPath& one, const SkPath& two, SkPathOp op, const char* name);
-#endif
     static void DumpAngles(const SkTArray<class SkOpAngle, true>& angles);
     static void DumpAngles(const SkTArray<class SkOpAngle* , true>& angles);
+    static void DumpContours(const SkTArray<class SkOpContour, true>& contours);
+    static void DumpContours(const SkTArray<class SkOpContour* , true>& contours);
+    static void DumpContourAngles(const SkTArray<class SkOpContour, true>& contours);
+    static void DumpContourAngles(const SkTArray<class SkOpContour* , true>& contours);
+    static void DumpContourPts(const SkTArray<class SkOpContour, true>& contours);
+    static void DumpContourPts(const SkTArray<class SkOpContour* , true>& contours);
+    static void DumpContourSpans(const SkTArray<class SkOpContour, true>& contours);
+    static void DumpContourSpans(const SkTArray<class SkOpContour* , true>& contours);
+    static void DumpSpans(const SkTDArray<struct SkOpSpan *>& );
+    static void DumpSpans(const SkTDArray<struct SkOpSpan *>* );
 };
 
 // shorthand for calling from debugger
 void Dump(const SkTArray<class SkOpAngle, true>& angles);
 void Dump(const SkTArray<class SkOpAngle* , true>& angles);
 void Dump(const SkTArray<class SkOpAngle, true>* angles);
 void Dump(const SkTArray<class SkOpAngle* , true>* angles);
 
-#endif  // SK_DEBUG || !FORCE_RELEASE
+void Dump(const SkTArray<class SkOpContour, true>& contours);
+void Dump(const SkTArray<class SkOpContour* , true>& contours);
+void Dump(const SkTArray<class SkOpContour, true>* contours);
+void Dump(const SkTArray<class SkOpContour* , true>* contours);
+
+void Dump(const SkTDArray<SkOpSpan *>& chaseArray);
+void Dump(const SkTDArray<SkOpSpan *>* chaseArray);
+
+void DumpAngles(const SkTArray<class SkOpContour, true>& contours);
+void DumpAngles(const SkTArray<class SkOpContour* , true>& contours);
+void DumpAngles(const SkTArray<class SkOpContour, true>* contours);
+void DumpAngles(const SkTArray<class SkOpContour* , true>* contours);
+
+void DumpPts(const SkTArray<class SkOpContour, true>& contours);
+void DumpPts(const SkTArray<class SkOpContour* , true>& contours);
+void DumpPts(const SkTArray<class SkOpContour, true>* contours);
+void DumpPts(const SkTArray<class SkOpContour* , true>* contours);
+
+void DumpSpans(const SkTArray<class SkOpContour, true>& contours);
+void DumpSpans(const SkTArray<class SkOpContour* , true>& contours);
+void DumpSpans(const SkTArray<class SkOpContour, true>* contours);
+void DumpSpans(const SkTArray<class SkOpContour* , true>* contours);
+
+// generates tools/path_sorter.htm and path_visualizer.htm compatible data
+void DumpQ(const struct SkDQuad& quad1, const struct SkDQuad& quad2, int testNo);
+
+void DumpT(const struct SkDQuad& quad, double t);
 
 #endif