cumulative pathops patch

tests/PathOpsOpCubicThreadedTest.cpp

Index: tests/PathOpsOpCubicThreadedTest.cpp
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index 751ccc5f1baedfa01089b494b1fad988fa2bf2ee..6f621704952278d7076e949b9ad3a17afb7e184e 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -27,6 +27,10 @@ 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 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");
@@ -41,6 +45,9 @@ static void testOpCubicsMain(PathOpsThreadState* data) {
             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, "    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));
@@ -52,7 +59,7 @@ static void testOpCubicsMain(PathOpsThreadState* data) {
         pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.fB),
                 SkIntToScalar(state.fA), SkIntToScalar(state.fD), SkIntToScalar(state.fC));
         pathB.close();
-        for (int op = 0 ; op <= kXOR_PathOp; ++op)    {
+        for (int op = 0 ; op <= kXOR_SkPathOp; ++op)    {
             if (progress) {
                 outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
             }