Revert of pathops version two

gyp/core.gypi

Index: gyp/core.gypi
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 28188d5b231197e99548f581be3da243ac9defc7..10db77259d05d82ce53901fb791d65472c3571e1 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -330,19 +330,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',
@@ -353,24 +352,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',
@@ -380,9 +377,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',
     ],
 }