Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall.

Extended tests (150M+) run to completion in release in about 6 minutes; the standard test suite exceeds 100K and finishes in a few seconds on desktops.

TBR=reed
BUG=skia:3588

Review URL: https://codereview.chromium.org/1037953004

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
index 5db3272ca3..d2fb1185ac 100644
--- a/tests/PathOpsOpRectThreadedTest.cpp
+++ b/tests/PathOpsOpRectThreadedTest.cpp
@@ -29,8 +29,13 @@ static void testPathOpsRectsMain(PathOpsThreadState* data)
                 for (int d = c + 1 ; d < 7; ++d) {
                     for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
     for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f)   {
+        static int testNum = 6;
         if (progress) {
             char* str = pathStr;
+            str += sprintf(str,
+                    "static void rects%d(skiatest::Reporter* reporter, const char* filename) {\n",
+                    testNum);
+            str += sprintf(str, "    SkPath path, pathB;");
             str += sprintf(str, "    path.setFillType(SkPath::k%s_FillType);\n",
                     e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
                     ? "EvenOdd" : "?UNDEFINED");
@@ -45,6 +50,9 @@ static void testPathOpsRectsMain(PathOpsThreadState* data)
                     " SkPath::kCW_Direction);\n", a, a, b, b);
             str += sprintf(str, "    pathB.addRect(%d, %d, %d, %d,"
                     " SkPath::kCW_Direction);\n", c, c, d, d);
+            str += sprintf(str,
+                    "    testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);\n");
+            str += sprintf(str, "}\n\n");
         }
         SkPath pathA, pathB;
         pathA.setFillType((SkPath::FillType) e);