add conics to path ops

tests/PathOpsOpLoopThreadedTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 
 static int add_point(char* str, SkScalar x, SkScalar y) {
@@ skipping 35 matching lines @@
                          SkIntToScalar(b * state.fA + d * (6 - state.fA)) / 6 };
         SkPoint midB = { SkIntToScalar(a * state.fB + c * (6 - state.fB)) / 6,
                          SkIntToScalar(b * state.fB + d * (6 - state.fB)) / 6 };
         SkPoint endC = { midA.fX + v.fY * state.fC / 3,
                           midA.fY + v.fX * state.fC / 3 };
         SkPoint endD = { midB.fX - v.fY * state.fD / 3,
                           midB.fY + v.fX * state.fD / 3 };
         SkPath pathA, pathB;
         if (progress) {
             char* str = pathStr;
-            const int loopNo = 7;
+            const int loopNo = 12;
             str += sprintf(str, "static void loop%d(skiatest::Reporter* reporter,"
                     " const char* filename) {\n", loopNo);
             str += sprintf(str, "    SkPath path, pathB;\n");
             str += sprintf(str, "    path.moveTo(%d,%d);\n", a, b);
             str += sprintf(str, "    path.cubicTo(%d,%d, ", c, d);
             str += add_point(str, endC.fX, endC.fY);
             str += sprintf(str, ", ");
             str += add_point(str, endD.fX, endD.fY);
             str += sprintf(str, ");\n");
             str += sprintf(str, "    path.close();\n");
@@ skipping 19 matching lines @@
             outputProgress(state.fPathStr, pathStr, kIntersect_SkPathOp);
         }
         testThreadedPathOp(state.fReporter, pathA, pathB, kIntersect_SkPathOp, "loops");
                 }
             }
         }
     }
 }
 
 DEF_TEST(PathOpsOpLoopsThreaded, reporter) {
-    initializeTests(reporter, "cubicOp");
+    initializeTests(reporter, "loopOp");
     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) {
                     *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
                             (&testOpLoopsMain, a, b, c, d, &testRunner));
                 }
             }
             if (!reporter->allowExtendedTest()) goto finish;
         }
     }
 finish:
     testRunner.render();
-    ShowTestArray();
+    ShowTestArray("loopOp");
 }
-
-DEF_TEST(PathOpsOpLoops, reporter) {
-    initializeTests(reporter, "cubicOp");
-    PathOpsThreadState state;
-    state.fReporter = reporter;
-    SkBitmap bitmap;
-    state.fBitmap = &bitmap;
-    char pathStr[PATH_STR_SIZE];
-    state.fPathStr = pathStr;
-    for (state.fA = 0; state.fA < 6; ++state.fA) {  // outermost
-        for (state.fB = state.fA + 1; state.fB < 7; ++state.fB) {
-            for (state.fC = 0 ; state.fC < 6; ++state.fC) {
-                for (state.fD = state.fC + 1; state.fD < 7; ++state.fD) {
-                    testOpLoopsMain(&state);
-                }
-            }
-            if (!reporter->allowExtendedTest()) goto finish;
-        }
-    }
-finish:
-    ShowTestArray();
-}