add conics to path ops

tests/PathOpsOpCircleThreadedTest.cpp

Index: tests/PathOpsOpCircleThreadedTest.cpp
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
similarity index 58%
copy from tests/PathOpsOpCubicThreadedTest.cpp
copy to tests/PathOpsOpCircleThreadedTest.cpp
index 6f621704952278d7076e949b9ad3a17afb7e184e..73abdec438c7f60316aad910f8189eb197d84de2 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Google Inc.
+ * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
@@ -7,17 +7,15 @@
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 
-static void testOpCubicsMain(PathOpsThreadState* data) {
-#if DEBUG_SHOW_TEST_NAME
-    strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
-#endif
-    SkASSERT(data);
+static void testOpCirclesMain(PathOpsThreadState* data) {
+        SkASSERT(data);
     PathOpsThreadState& state = *data;
-    char pathStr[1024];  // gdb: set print elements 400
+    char pathStr[1024];
     bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
     if (progress) {
         sk_bzero(pathStr, sizeof(pathStr));
     }
+
     for (int a = 0 ; a < 6; ++a) {
         for (int b = a + 1 ; b < 7; ++b) {
             for (int c = 0 ; c < 6; ++c) {
@@ -27,43 +25,35 @@ static void testOpCubicsMain(PathOpsThreadState* data) {
         SkPath pathA, pathB;
         if (progress) {
             char* str = pathStr;
-            const int loopNo = 129;
-            str += sprintf(str, "static void cubicOp%d(skiatest::Reporter* reporter,"
+            const int loopNo = 4;
+            str += sprintf(str, "static void circlesOp%d(skiatest::Reporter* reporter,"
                     " const char* filename) {\n", loopNo);
             str += sprintf(str, "    SkPath path, pathB;\n");
             str += sprintf(str, "    path.setFillType(SkPath::k%s_FillType);\n",
                     e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
                     ? "EvenOdd" : "?UNDEFINED");
-            str += sprintf(str, "    path.moveTo(%d,%d);\n", state.fA, state.fB);
-            str += sprintf(str, "    path.cubicTo(%d,%d, %d,%d, %d,%d);\n", state.fC, state.fD,
-                    b, a, d, c);
-            str += sprintf(str, "    path.close();\n");
+            str += sprintf(str, "    path.addCircle(%d, %d, %d, %s);\n", state.fA, state.fB,
+                    state.fC, state.fD ? "SkPath::kCW_Direction" : "SkPath::kCCW_Direction");
             str += sprintf(str, "    pathB.setFillType(SkPath::k%s_FillType);\n",
                     f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
                     ? "EvenOdd" : "?UNDEFINED");
-            str += sprintf(str, "    pathB.moveTo(%d,%d);\n", a, b);
-            str += sprintf(str, "    pathB.cubicTo(%d,%d, %d,%d, %d,%d);\n", c, d,
-                    state.fB, state.fA, state.fD, state.fC);
-            str += sprintf(str, "    pathB.close();\n");
+            str += sprintf(str, "    pathB.addCircle(%d, %d, %d, %s);\n", a, b,
+                    c, d ? "SkPath::kCW_Direction" : "SkPath::kCCW_Direction");
             str += sprintf(str, "    testPathOp(reporter, path, pathB, kDifference_SkPathOp,"
                     " filename);\n");
             str += sprintf(str, "}\n");
         }
         pathA.setFillType((SkPath::FillType) e);
-        pathA.moveTo(SkIntToScalar(state.fA), SkIntToScalar(state.fB));
-        pathA.cubicTo(SkIntToScalar(state.fC), SkIntToScalar(state.fD), SkIntToScalar(b),
-                SkIntToScalar(a), SkIntToScalar(d), SkIntToScalar(c));
-        pathA.close();
+        pathA.addCircle(SkIntToScalar(state.fA), SkIntToScalar(state.fB), SkIntToScalar(state.fC),
+                state.fD ? SkPath::kCW_Direction : SkPath::kCCW_Direction);
         pathB.setFillType((SkPath::FillType) f);
-        pathB.moveTo(SkIntToScalar(a), SkIntToScalar(b));
-        pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.fB),
-                SkIntToScalar(state.fA), SkIntToScalar(state.fD), SkIntToScalar(state.fC));
-        pathB.close();
+        pathB.addCircle(SkIntToScalar(a), SkIntToScalar(b), SkIntToScalar(c),
+                d ? SkPath::kCW_Direction : SkPath::kCCW_Direction);
         for (int op = 0 ; op <= kXOR_SkPathOp; ++op)    {
             if (progress) {
                 outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
             }
-            testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "cubics");
+            testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "circles");
         }
     }
                     }
@@ -73,15 +63,15 @@ static void testOpCubicsMain(PathOpsThreadState* data) {
     }
 }
 
-DEF_TEST(PathOpsOpCubicsThreaded, reporter) {
-    initializeTests(reporter, "cubicOp");
+DEF_TEST(PathOpsOpCircleThreaded, reporter) {
+    initializeTests(reporter, "circleOp");
     PathOpsThreadedTestRunner testRunner(reporter);
     for (int a = 0; a < 6; ++a) {  // outermost
         for (int b = a + 1; b < 7; ++b) {
             for (int c = 0 ; c < 6; ++c) {
-                for (int d = c + 1; d < 7; ++d) {
+                for (int d = 0; d < 2; ++d) {
                     *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
-                            (&testOpCubicsMain, a, b, c, d, &testRunner));
+                            (&testOpCirclesMain, a, b, c, d, &testRunner));
                 }
             }
             if (!reporter->allowExtendedTest()) goto finish;
@@ -89,5 +79,5 @@ DEF_TEST(PathOpsOpCubicsThreaded, reporter) {
     }
 finish:
     testRunner.render();
-    ShowTestArray();
+    ShowTestArray("circleOp");
 }