Revert of pathops version two (patchset #16 id:150001 of https://codereview.chromium.org/1002693002/)

Reason for revert:
ASAN investigation

Original issue's description:
> pathops version two
>
> R=reed@google.com
>
> marked 'no commit' to attempt to get trybots to run
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/ccec0f958ffc71a9986d236bc2eb335cb2111119

TBR=caryclark@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

4 files changed, 74 insertions, 18 deletions

diff --git a/gyp/core.gypi b/gyp/core.gypi
index 4d8938844c..95e5eb939c 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -331,19 +331,18 @@
         '<(skia_include_path)/pathops/SkPathOps.h',
 
         '<(skia_src_path)/pathops/SkAddIntersections.cpp',
+        '<(skia_src_path)/pathops/SkDCubicIntersection.cpp',
         '<(skia_src_path)/pathops/SkDCubicLineIntersection.cpp',
         '<(skia_src_path)/pathops/SkDCubicToQuads.cpp',
         '<(skia_src_path)/pathops/SkDLineIntersection.cpp',
+        '<(skia_src_path)/pathops/SkDQuadImplicit.cpp',
+        '<(skia_src_path)/pathops/SkDQuadIntersection.cpp',
         '<(skia_src_path)/pathops/SkDQuadLineIntersection.cpp',
         '<(skia_src_path)/pathops/SkIntersections.cpp',
         '<(skia_src_path)/pathops/SkOpAngle.cpp',
-        '<(skia_src_path)/pathops/SkOpBuilder.cpp',
-        '<(skia_src_path)/pathops/SkOpCoincidence.cpp',
         '<(skia_src_path)/pathops/SkOpContour.cpp',
-        '<(skia_src_path)/pathops/SkOpCubicHull.cpp',
         '<(skia_src_path)/pathops/SkOpEdgeBuilder.cpp',
         '<(skia_src_path)/pathops/SkOpSegment.cpp',
-        '<(skia_src_path)/pathops/SkOpSpan.cpp',
         '<(skia_src_path)/pathops/SkPathOpsBounds.cpp',
         '<(skia_src_path)/pathops/SkPathOpsCommon.cpp',
         '<(skia_src_path)/pathops/SkPathOpsCubic.cpp',
@@ -354,24 +353,22 @@
         '<(skia_src_path)/pathops/SkPathOpsQuad.cpp',
         '<(skia_src_path)/pathops/SkPathOpsRect.cpp',
         '<(skia_src_path)/pathops/SkPathOpsSimplify.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsTCubicSect.cpp',
         '<(skia_src_path)/pathops/SkPathOpsTightBounds.cpp',
-        '<(skia_src_path)/pathops/SkPathOpsTQuadSect.cpp',
+        '<(skia_src_path)/pathops/SkPathOpsTriangle.cpp',
         '<(skia_src_path)/pathops/SkPathOpsTypes.cpp',
         '<(skia_src_path)/pathops/SkPathWriter.cpp',
+        '<(skia_src_path)/pathops/SkQuarticRoot.cpp',
         '<(skia_src_path)/pathops/SkReduceOrder.cpp',
-
         '<(skia_src_path)/pathops/SkAddIntersections.h',
+        '<(skia_src_path)/pathops/SkDQuadImplicit.h',
         '<(skia_src_path)/pathops/SkIntersectionHelper.h',
         '<(skia_src_path)/pathops/SkIntersections.h',
         '<(skia_src_path)/pathops/SkLineParameters.h',
         '<(skia_src_path)/pathops/SkOpAngle.h',
-        '<(skia_src_path)/pathops/SkOpCoincidence.h',
         '<(skia_src_path)/pathops/SkOpContour.h',
         '<(skia_src_path)/pathops/SkOpEdgeBuilder.h',
         '<(skia_src_path)/pathops/SkOpSegment.h',
         '<(skia_src_path)/pathops/SkOpSpan.h',
-        '<(skia_src_path)/pathops/SkOpTAllocator.h',
         '<(skia_src_path)/pathops/SkPathOpsBounds.h',
         '<(skia_src_path)/pathops/SkPathOpsCommon.h',
         '<(skia_src_path)/pathops/SkPathOpsCubic.h',
@@ -381,9 +378,10 @@
         '<(skia_src_path)/pathops/SkPathOpsPoint.h',
         '<(skia_src_path)/pathops/SkPathOpsQuad.h',
         '<(skia_src_path)/pathops/SkPathOpsRect.h',
-        '<(skia_src_path)/pathops/SkPathOpsTSect.h',
+        '<(skia_src_path)/pathops/SkPathOpsTriangle.h',
         '<(skia_src_path)/pathops/SkPathOpsTypes.h',
         '<(skia_src_path)/pathops/SkPathWriter.h',
+        '<(skia_src_path)/pathops/SkQuarticRoot.h',
         '<(skia_src_path)/pathops/SkReduceOrder.h',
     ],
 }
diff --git a/gyp/pathops.gypi b/gyp/pathops.gypi
new file mode 100644
index 0000000000..3bb163e98b
--- /dev/null
+++ b/gyp/pathops.gypi
@@ -0,0 +1,61 @@
+{
+  'include_dirs' : [
+    '../include/pathops',
+    '../src/pathops',
+  ],
+  'sources': [
+    '../include/pathops/SkPathOps.h',
+    '../src/pathops/SkAddIntersections.cpp',
+    '../src/pathops/SkDCubicIntersection.cpp',
+    '../src/pathops/SkDCubicLineIntersection.cpp',
+    '../src/pathops/SkDCubicToQuads.cpp',
+    '../src/pathops/SkDLineIntersection.cpp',
+    '../src/pathops/SkDQuadImplicit.cpp',
+    '../src/pathops/SkDQuadIntersection.cpp',
+    '../src/pathops/SkDQuadLineIntersection.cpp',
+    '../src/pathops/SkIntersections.cpp',
+    '../src/pathops/SkOpAngle.cpp',
+    '../src/pathops/SkOpContour.cpp',
+    '../src/pathops/SkOpEdgeBuilder.cpp',
+    '../src/pathops/SkOpSegment.cpp',
+    '../src/pathops/SkPathOpsBounds.cpp',
+    '../src/pathops/SkPathOpsCommon.cpp',
+    '../src/pathops/SkPathOpsCubic.cpp',
+    '../src/pathops/SkPathOpsDebug.cpp',
+    '../src/pathops/SkPathOpsLine.cpp',
+    '../src/pathops/SkPathOpsOp.cpp',
+    '../src/pathops/SkPathOpsPoint.cpp',
+    '../src/pathops/SkPathOpsQuad.cpp',
+    '../src/pathops/SkPathOpsRect.cpp',
+    '../src/pathops/SkPathOpsSimplify.cpp',
+    '../src/pathops/SkPathOpsTriangle.cpp',
+    '../src/pathops/SkPathOpsTypes.cpp',
+    '../src/pathops/SkPathWriter.cpp',
+    '../src/pathops/SkQuarticRoot.cpp',
+    '../src/pathops/SkReduceOrder.cpp',
+    '../src/pathops/SkAddIntersections.h',
+    '../src/pathops/SkDQuadImplicit.h',
+    '../src/pathops/SkIntersectionHelper.h',
+    '../src/pathops/SkIntersections.h',
+    '../src/pathops/SkLineParameters.h',
+    '../src/pathops/SkOpAngle.h',
+    '../src/pathops/SkOpContour.h',
+    '../src/pathops/SkOpEdgeBuilder.h',
+    '../src/pathops/SkOpSegment.h',
+    '../src/pathops/SkOpSpan.h',
+    '../src/pathops/SkPathOpsBounds.h',
+    '../src/pathops/SkPathOpsCommon.h',
+    '../src/pathops/SkPathOpsCubic.h',
+    '../src/pathops/SkPathOpsCurve.h',
+    '../src/pathops/SkPathOpsDebug.h',
+    '../src/pathops/SkPathOpsLine.h',
+    '../src/pathops/SkPathOpsPoint.h',
+    '../src/pathops/SkPathOpsQuad.h',
+    '../src/pathops/SkPathOpsRect.h',
+    '../src/pathops/SkPathOpsTriangle.h',
+    '../src/pathops/SkPathOpsTypes.h',
+    '../src/pathops/SkPathWriter.h',
+    '../src/pathops/SkQuarticRoot.h',
+    '../src/pathops/SkReduceOrder.h',
+  ],
+}
diff --git a/gyp/pathops_unittest.gyp b/gyp/pathops_unittest.gyp
index b0da432c67..c8732545f2 100644
--- a/gyp/pathops_unittest.gyp
+++ b/gyp/pathops_unittest.gyp
@@ -20,7 +20,6 @@
         '../tests/PathOpsCubicLineIntersectionIdeas.cpp',
         '../tests/PathOpsDebug.cpp',
         '../tests/PathOpsOpLoopThreadedTest.cpp',
-        '../tests/PathOpsTSectDebug.h',
         '../tests/skia_test.cpp',
       ],
       'conditions': [
diff --git a/gyp/pathops_unittest.gypi b/gyp/pathops_unittest.gypi
index e3a6174a5a..5117b63caa 100644
--- a/gyp/pathops_unittest.gypi
+++ b/gyp/pathops_unittest.gypi
@@ -19,17 +19,18 @@
 
     '../tests/PathOpsAngleTest.cpp',
     '../tests/PathOpsBoundsTest.cpp',
-    '../tests/PathOpsBuilderTest.cpp',
-    '../tests/PathOpsBuildUseTest.cpp',
     '../tests/PathOpsCubicIntersectionTest.cpp',
     '../tests/PathOpsCubicIntersectionTestData.cpp',
     '../tests/PathOpsCubicLineIntersectionTest.cpp',
     '../tests/PathOpsCubicQuadIntersectionTest.cpp',
     '../tests/PathOpsCubicReduceOrderTest.cpp',
+    '../tests/PathOpsCubicToQuadsTest.cpp',
     '../tests/PathOpsDCubicTest.cpp',
     '../tests/PathOpsDLineTest.cpp',
     '../tests/PathOpsDPointTest.cpp',
+    '../tests/PathOpsDQuadTest.cpp',
     '../tests/PathOpsDRectTest.cpp',
+    '../tests/PathOpsDTriangleTest.cpp',
     '../tests/PathOpsDVectorTest.cpp',
     '../tests/PathOpsExtendedTest.cpp',
     '../tests/PathOpsFuzz763Test.cpp',
@@ -43,6 +44,7 @@
     '../tests/PathOpsQuadIntersectionTestData.cpp',
     '../tests/PathOpsQuadLineIntersectionTest.cpp',
     '../tests/PathOpsQuadLineIntersectionThreadedTest.cpp',
+    '../tests/PathOpsQuadParameterizationTest.cpp',
     '../tests/PathOpsQuadReduceOrderTest.cpp',
     '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp',
     '../tests/PathOpsSimplifyFailTest.cpp',
@@ -54,15 +56,11 @@
     '../tests/PathOpsSkpTest.cpp',
     '../tests/PathOpsTestCommon.cpp',
     '../tests/PathOpsThreadedCommon.cpp',
-    '../tests/PathOpsThreeWayTest.cpp',
-    '../tests/PathOpsTightBoundsTest.cpp', 
-    '../tests/PathOpsTypesTest.cpp', 
-
+    '../tests/PathOpsTightBoundsTest.cpp',
     '../tests/PathOpsCubicIntersectionTestData.h',
     '../tests/PathOpsExtendedTest.h',
     '../tests/PathOpsQuadIntersectionTestData.h',
     '../tests/PathOpsTestCommon.h',
     '../tests/PathOpsThreadedCommon.h',
-    '../tests/PathOpsTSectDebug.h',
   ],
 }