From 27c46a08a9210e9306b8ea1b00349ec198153c38 Mon Sep 17 00:00:00 2001
From: hcm <hcm@google.com>
Date: Tue, 28 Oct 2014 10:55:54 -0700
Subject: Revert of harden pathops for pathological test (patchset #19
 id:410001 of https://codereview.chromium.org/633393002/)

Reason for revert:
Compile errors on bots

Original issue's description:
> These tests stress pathops by describing the union of circle-like paths that have tiny line segments embedded and double back to create near-coincident conditions.
>
> The fixes include
> - detect when finding the active top loops between two possible answers
> - preflight chasing winding to ensure answer is consistent
> - binary search more often when quadratic intersection fails
> - add more failure paths when an intersect is missed
>
> While this fixes the chrome bug, reenabling path ops in svg should be deferred until additional fixes are landed.
>
> TBR=
> BUG=421132
>
> Committed: https://skia.googlesource.com/skia/+/6f726addf3178b01949bb389ef83cf14a1d7b6b2

TBR=caryclark@google.com
NOTREECHECKS=true
NOTRY=true
BUG=421132

Review URL: https://codereview.chromium.org/686843002
---
 tests/PathOpsQuadIntersectionTest.cpp | 38 ++++++++---------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

(limited to 'tests/PathOpsQuadIntersectionTest.cpp')

diff --git a/tests/PathOpsQuadIntersectionTest.cpp b/tests/PathOpsQuadIntersectionTest.cpp
index 565098af81..1ddbbcc51e 100644
--- a/tests/PathOpsQuadIntersectionTest.cpp
+++ b/tests/PathOpsQuadIntersectionTest.cpp
@@ -53,28 +53,6 @@ static void standardTestCases(skiatest::Reporter* reporter) {
 }
 
 static const SkDQuad testSet[] = {
-{{{-37.3484879,10.0192947}, {-36.4966316,13.2140198}, {-38.1506348,16.0788383}}},
-{{{-38.1462746,16.08918}, {-36.4904327,13.2193804}, {-37.3484879,10.0192947}}},
-
-{{{-37.3513985,10.0082998}, {-36.4938011,13.2090998}, {-38.1506004,16.0788002}}},
-{{{-37.3508987,10.0102997}, {-36.4930992,13.2110004}, {-38.1497993,16.0809002}}},
-
-{{{-37.3508987,10.0102997}, {-37.3510017,10.0098}, {-37.3512001,10.0093002}}},
-{{{-49.0778008,19.0097008}, {-38.2086983,6.80954981}, {-37.3508987,10.0102997}}},
-
-{{{SkBits2Float(0xc22423b2), SkBits2Float(0x40afae2c)},
-        {SkBits2Float(0xc2189b24), SkBits2Float(0x40e3f058)},
-        {SkBits2Float(0xc21511d9), SkBits2Float(0x41251125)}}},
-{{{SkBits2Float(0xc2153d2f), SkBits2Float(0x412299db)},
-        {SkBits2Float(0xc2153265), SkBits2Float(0x41233845)},
-        {SkBits2Float(0xc21527fc), SkBits2Float(0x4123d684)}}},
-
-{{{-37.3097496, 10.1625624}, {-37.2992134, 10.2012377}, {-37.2890472, 10.239872}}},
-{{{-41.0348587, 5.49001122}, {-38.1515045, 7.12308884}, {-37.2674294, 10.3166857}}},
-
-{{{-52.8062439,14.1493912}, {-53.6638947,10.948595}, {-52.0070419,8.07883835}}},
-{{{-52.8054848,14.1522331}, {-53.6633072,10.9514809}, {-52.0066071,8.08163643}}},
-
 {{{441.853149, 308.209106}, {434.672272, 315.389984}, {424.516998, 315.389984}}},
 {{{385.207275, 334.241272}, {406.481598, 312.96698}, {436.567993, 312.96698}}},
 
@@ -311,6 +289,10 @@ static void oneOffTest1(skiatest::Reporter* reporter, size_t outer, size_t inner
     }
 }
 
+DEF_TEST(PathOpsQuadIntersectionOneOff, reporter) {
+    oneOffTest1(reporter, 0, 1);
+}
+
 static void oneOffTests(skiatest::Reporter* reporter) {
     for (size_t outer = 0; outer < testSetCount - 1; ++outer) {
         for (size_t inner = outer + 1; inner < testSetCount; ++inner) {
@@ -356,6 +338,10 @@ static void coincidentTest(skiatest::Reporter* reporter) {
     }
 }
 
+DEF_TEST(PathOpsQuadIntersectionCoincidenceOneOff, reporter) {
+    coincidentTestOne(reporter, 0, 1);
+}
+
 static int floatSign(double x) {
     return x < 0 ? -1 : x > 0 ? 1 : 0;
 }
@@ -526,11 +512,3 @@ DEF_TEST(PathOpsQuadIntersection, reporter) {
     if (false) QuadraticIntersection_IntersectionFinder();
     if (false) QuadraticIntersection_PointFinder();
 }
-
-DEF_TEST(PathOpsQuadIntersectionCoincidenceOneOff, reporter) {
-    coincidentTestOne(reporter, 0, 1);
-}
-
-DEF_TEST(PathOpsQuadIntersectionOneOff, reporter) {
-    oneOffTest1(reporter, 0, 1);
-}
-- 
cgit v1.2.3