fix pathops skp-derived bugs; add more failing tests

tests/PathOpsSkpTest.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 3553 matching lines @@
     path.close();
     SkPath pathB;
     pathB.setFillType(SkPath::kWinding_FillType);
     pathB.moveTo(365, 5082);
     pathB.lineTo(365.848175f, 5081.15186f);
     pathB.lineTo(368, 5103);
     pathB.lineTo(365, 5106);
     testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
 }
 
-#if TEST_NEW_FAILURES
-// addTCoincident SkASSERT(test->fT < 1);
 static void skpwww_googleventures_com_32(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(725.911682f, 898.767456f);
     path.lineTo(741.232544f, 885.911682f);
     path.lineTo(754.088318f, 901.232544f);
     path.lineTo(738.767456f, 914.088318f);
     path.lineTo(725.911682f, 898.767456f);
     path.close();
     SkPath pathB;
     pathB.setFillType(SkPath::kWinding_FillType);
     pathB.moveTo(728.37677f, 870.59082f);
     pathB.lineTo(754.088257f, 901.232605f);
     pathB.lineTo(738.767395f, 914.088379f);
     pathB.lineTo(713.055908f, 883.446594f);
     pathB.close();
     testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
 }
 
-// checkSmallCoincidence failed assertion "!next->fSmall || checkMultiple"
+#if TEST_NEW_FAILURES
 static void skpwww_devbridge_com_22(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(4915, 1523);
     path.quadTo(4887.24756f, 1523, 4867.62402f, 1542.6239f);
     path.quadTo(4848, 1562.24768f, 4848, 1590);
     path.quadTo(4848, 1617.75232f, 4867.62402f, 1637.3761f);
     path.quadTo(4887.24756f, 1657, 4915, 1657);
     path.quadTo(4942.75244f, 1657, 4962.37598f, 1637.3761f);
     path.quadTo(4982, 1617.75232f, 4982, 1590);
@@ skipping 59 matching lines @@
     path.lineTo(143, 14557);
     path.close();
     SkPath pathB;
     pathB.setFillType(SkPath::kWinding_FillType);
     pathB.moveTo(143, 14557);
     pathB.lineTo(143, 14555.9902f);
     pathB.lineTo(165, 14556);
     pathB.lineTo(165, 14557);
     testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
 }
+#endif
 
-// addTCancel: failed assertion "oIndex > 0"
 static void skpwww_firstunitedbank_com_19(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(808.585815f, 11673.5859f);
     path.quadTo(809.17157f, 11673, 810, 11673);
     path.lineTo(1032, 11673);
     path.quadTo(1038.21326f, 11673, 1042.60657f, 11677.3936f);
     path.quadTo(1047, 11681.7871f, 1047, 11688);
     path.quadTo(1047, 11682.2012f, 1042.60657f, 11678.1006f);
     path.quadTo(1038.21326f, 11674, 1032, 11674);
@@ skipping 15 matching lines @@
     path.quadTo(808, 11674.1719f, 808.585815f, 11673.5859f);
     path.close();
     SkPath pathB;
     pathB.setFillType(SkPath::kWinding_FillType);
     pathB.moveTo(808, 11703);
     pathB.lineTo(809.5f, 11701.5f);
     pathB.lineTo(1062.91907f, 11687.0811f);
     pathB.lineTo(1047, 11703);
     testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
 }
-#endif
 
 // addSimpleAngle: failed assertion "index == count() - 2"
 static void skpwww_shinydemos_com_5(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(205.884888f, 648.203857f);
     path.lineTo(771.570374f, 82.5183716f);
     path.lineTo(1110.98169f, 421.929626f);
     path.lineTo(545.296143f, 987.615112f);
     path.lineTo(205.884888f, 648.203857f);
@@ skipping 34 matching lines @@
     pathB.lineTo(344.333344f, 1465.66675f);
     pathB.cubicTo(344.333344f, 1467.32361f, 342.840942f, 1468.66675f, 341, 1468.66675f);
     pathB.lineTo(81, 1468.66675f);
     pathB.cubicTo(79.15905f, 1468.66675f, 77.6666718f, 1467.32361f, 77.6666718f, 1465.66675f);
     pathB.lineTo(77.6666718f, 1396.66675f);
     pathB.cubicTo(77.6666718f, 1394.82568f, 79.15905f, 1393.33337f, 81, 1393.33337f);
     pathB.close();
     testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
 }
 
+#if TEST_NEW_FAILURES
+// SkOpSegment.cpp:3915: failed assertion "otherEnd >= 0"
+static void skpwww_shinydemos_com_15(skiatest::Reporter* reporter, const char* filename) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(1000, 310.947968f);
+    path.lineTo(771.570374f, 82.5183716f);
+    path.lineTo(205.884888f, 648.203857f);
+    path.lineTo(448.68103f, 891);
+    path.lineTo(641.911255f, 891);
+    path.lineTo(1000, 532.911316f);
+    path.lineTo(1000, 310.947968f);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(771.570374f, 82.5183716f);
+    pathB.lineTo(1110.98169f, 421.929626f);
+    pathB.lineTo(545.296204f, 987.615051f);
+    pathB.lineTo(205.884949f, 648.203796f);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
+}
+
+// SkOpSegment.cpp:4398: failed assertion "!span->fDone"
+static void skpwww_lptemp_com_5(skiatest::Reporter* reporter, const char* filename) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(78.6429825f, 3150.97632f);
+    path.quadTo(79.6192932f, 3150, 81.0000076f, 3150);
+    path.lineTo(341, 3150);
+    path.quadTo(342.380707f, 3150, 343.357025f, 3150.97632f);
+    path.quadTo(344.333344f, 3151.95264f, 344.333344f, 3153.33325f);
+    path.lineTo(344.333344f, 5205.3335f);
+    path.quadTo(344.333344f, 5206.71436f, 343.357025f, 5207.69092f);
+    path.quadTo(342.380707f, 5208.66699f, 341, 5208.66699f);
+    path.lineTo(81.0000076f, 5208.66699f);
+    path.quadTo(79.6192932f, 5208.66699f, 78.6429825f, 5207.69092f);
+    path.quadTo(77.6666718f, 5206.71436f, 77.6666718f, 5205.3335f);
+    path.lineTo(77.6666718f, 3153.33325f);
+    path.quadTo(77.6666718f, 3151.95264f, 78.6429825f, 3150.97632f);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kEvenOdd_FillType);
+    pathB.moveTo(81, 3150);
+    pathB.lineTo(341, 3150);
+    pathB.cubicTo(342.840942f, 3150, 344.333344f, 3151.49268f, 344.333344f, 3153.3335f);
+    pathB.lineTo(344.333344f, 5205.3335f);
+    pathB.cubicTo(344.333344f, 5206.99023f, 342.840942f, 5208.3335f, 341, 5208.3335f);
+    pathB.lineTo(81, 5208.3335f);
+    pathB.cubicTo(79.15905f, 5208.3335f, 77.6666718f, 5206.99023f, 77.6666718f, 5205.3335f);
+    pathB.lineTo(77.6666718f, 3153.3335f);
+    pathB.cubicTo(77.6666718f, 3151.49268f, 79.15905f, 3150, 81, 3150);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
+}
+#endif
+
 static void (*firstTest)(skiatest::Reporter* , const char* filename) = 0;
 
 static struct TestDesc tests[] = {
     TEST(skpwww_lptemp_com_3),
     TEST(skpwww_shinydemos_com_5),
 #if TEST_NEW_FAILURES
+    TEST(skpwww_lptemp_com_5),
+    TEST(skpwww_shinydemos_com_15),
     TEST(skpwww_familysurvivalprotocol_wordpress_com_61),
     TEST(skpwww_alamdi_com_3),
     TEST(skpwww_devbridge_com_22),
+#endif
+    TEST(skpwww_firstunitedbank_com_19),
     TEST(skpwww_googleventures_com_32),
-#endif
     TEST(skpwww_9to5mac_com_64),
     TEST(skpwww_wartepop_blogspot_com_br_6),
     TEST(skpwww_wartepop_blogspot_com_br_6a),
     TEST(skpwww_cooksnaps_com_32a),
     TEST(skpwww_argus_presse_fr_41),
     TEST(skpwww_cooksnaps_com_17),
     TEST(skpwww_cooksnaps_com_32),
     TEST(skpwww_kitcheninspirations_wordpress_com_66),
     TEST(skpwww_tcmevents_org_13),
     TEST(skpwww_narayana_publishers_com_194),
@@ skipping 98 matching lines @@
 
 static bool runReverse = false;
 static void (*stopTest)(skiatest::Reporter* , const char* filename) = 0;
 
 DEF_TEST(PathOpsSkp, reporter) {
 #if DEBUG_SHOW_TEST_NAME
     strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
 #endif
     RunTestSet(reporter, tests, testCount, firstTest, stopTest, runReverse);
 }