commit 0dc4dd6dda9a7912f696b46d9c02155ec1d1ba5f
author reed <reed@google.com> Tue Mar 24 13:55:33 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Mar 24 13:55:33 2015 -0700
tree 994c85a8e418986415175ddccc71adf924df3846
parent 82dec0e16ae10026194ce45b67af931700510450

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

gyp/core.gypi

diff --git a/gyp/core.gypi b/gyp/core.gypi
index 4d89388..95e5eb9 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',
     ],
 }