cumulative pathops patch

tests/PathOpsSimplifyTest.cpp

 /*
  * Copyright 2012 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"
 
 #define TEST(name) { name, #name }
 
@@ skipping 3631 matching lines @@
     path.lineTo(1, 0);
     path.lineTo(3, 3);
     path.close();
     path.moveTo(1, 1);
     path.lineTo(2, 3);
     path.lineTo(1, 2);
     path.close();
     testSimplify(reporter, path, filename);
 }
 
-// A test this for this case:
+// A test for this case:
 // contourA has two segments that are coincident
 // contourB has two segments that are coincident in the same place
 // each ends up with +2/0 pairs for winding count
 // since logic in OpSegment::addTCoincident doesn't transfer count (only increments/decrements)
 // can this be resolved to +4/0 ?
 static void testAddTCoincident1(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.moveTo(2, 0);
     path.lineTo(2, 2);
     path.lineTo(1, 1);
@@ skipping 836 matching lines @@
     path.quadTo(3, 0, 2, 1);
     path.lineTo(3, 2);
     path.close();
     path.moveTo(3, 0);
     path.lineTo(2, 2);
     path.quadTo(0, 3, 0, 3);
     path.close();
     testSimplify(reporter, path, filename);
 }
 
-// this fails because there is a short unorderable segment and the unordered state isn't handled
-// correctly later on.
 static void testQuads46x(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(2, 0);
     path.quadTo(0, 1, 3, 2);
     path.lineTo(1, 3);
     path.close();
     path.moveTo(0, 0);
     path.lineTo(1, 1);
     path.quadTo(3, 2, 1, 3);
@@ skipping 151 matching lines @@
 static void testRect3(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.addRect(0, 0, 60, 60, SkPath::kCCW_Direction);
     path.addRect(10, 30, 40, 30, SkPath::kCCW_Direction);
     path.addRect(24, 6, 36, 36, SkPath::kCCW_Direction);
     path.addRect(32, 6, 36, 41, SkPath::kCCW_Direction);
     testSimplify(reporter, path, filename);
 }
 
-static void (*firstTest)(skiatest::Reporter* , const char* filename) = 0;
+static void (*skipTest)(skiatest::Reporter* , const char* filename) = 0;
+static void (*firstTest)(skiatest::Reporter* , const char* filename) = testCubic2;
+static void (*stopTest)(skiatest::Reporter* , const char* filename) = 0;
 
 static TestDesc tests[] = {
     TEST(testRect3),
     TEST(testQuadralateral10),
     TEST(testQuads61),
     TEST(testQuads60),
     TEST(testQuads59),
     TEST(testQuads58),
     TEST(testQuads57),
     TEST(testQuads56),
@@ skipping 38 matching lines @@
     TEST(testQuads35),
     TEST(testDegenerates1),
     TEST(testQuad13),
     TEST(testQuad14),
     TEST(testQuad15),
     TEST(testQuadratic56),
     TEST(testQuadralateral4),
     TEST(testQuadralateral3),
     TEST(testDegenerate5),
     TEST(testQuad12),
-    TEST(testQuadratic51),  // has unorderable angles
+    TEST(testQuadratic51),
     TEST(testQuad8),
     TEST(testQuad11),
     TEST(testQuad10),
     TEST(testQuad9),
     TEST(testTriangles4x),
     TEST(testTriangles3x),
     TEST(testRect2),
     TEST(testRect1),
     TEST(tooCloseTest),
     TEST(skphealth_com76),
@@ skipping 352 matching lines @@
     TEST(testLine1),
 };
 
 static const size_t subTestCount = SK_ARRAY_COUNT(subTests);
 
 static void (*firstSubTest)(skiatest::Reporter* , const char* filename) = 0;
 
 static bool runSubTests = false;
 static bool runSubTestsFirst = false;
 static bool runReverse = false;
-static void (*stopTest)(skiatest::Reporter* , const char* filename) = 0;
 
 DEF_TEST(PathOpsSimplify, reporter) {
     if (runSubTests && runSubTestsFirst) {
-        RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
+        RunTestSet(reporter, subTests, subTestCount, firstSubTest, NULL, stopTest, runReverse);
     }
-    RunTestSet(reporter, tests, testCount, firstTest, stopTest, runReverse);
+    RunTestSet(reporter, tests, testCount, firstTest, skipTest, stopTest, runReverse);
     if (runSubTests && !runSubTestsFirst) {
-        RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
+        RunTestSet(reporter, subTests, subTestCount, firstSubTest, NULL, stopTest, runReverse);
     }
 }