turn on pathops unit test

This temporarily disables SK_ENABLE_INST_COUNT 
( skbug.com/1219 )

This fixes a linktime error on VS2012 in
PathTest.cpp; -SK_ScalarInfinity should be
SK_ScalarNegativeInfinity instead.

This adds pathops and pathops unit tests to the
main unit tests.

Should this change destabilize anything, it should
be sufficient to comment out the pathops gypi
includes. at test.gyp:18,21.
Review URL: https://codereview.chromium.org/14137010

git-svn-id: http://skia.googlecode.com/svn/trunk@8644 2bbb7eff-a529-9590-31e7-b0007b416f81

4 files changed, 113 insertions, 93 deletions

diff --git a/gyp/pathops.gypi b/gyp/pathops.gypi
new file mode 100644
index 0000000000..75c166f576
--- /dev/null
+++ b/gyp/pathops.gypi
@@ -0,0 +1,63 @@
+{
+  '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/SkPathOpsSpan.h',
+    '../src/pathops/SkPathOpsTriangle.h',
+    '../src/pathops/SkPathOpsTypes.h',
+    '../src/pathops/SkPathWriter.h',
+    '../src/pathops/SkQuarticRoot.h',
+    '../src/pathops/SkReduceOrder.h',
+    '../src/pathops/TSearch.h',
+  ],
+}
diff --git a/gyp/pathops_unittest.gyp b/gyp/pathops_unittest.gyp
index b7fca5efc9..81d4c22834 100644
--- a/gyp/pathops_unittest.gyp
+++ b/gyp/pathops_unittest.gyp
@@ -19,100 +19,11 @@
         '../src/utils',
         '../tools/',
       ],
+      'includes': [
+        'pathops.gypi',
+        'pathops_unittest.gypi',
+      ],
       '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/SkPathOpsSpan.h',
-        '../src/pathops/SkPathOpsTriangle.h',
-        '../src/pathops/SkPathOpsTypes.h',
-        '../src/pathops/SkPathWriter.h',
-        '../src/pathops/SkQuarticRoot.h',
-        '../src/pathops/SkReduceOrder.h',
-        '../src/pathops/TSearch.h',
-        '../tests/PathOpsBoundsTest.cpp',
-        '../tests/PathOpsCubicIntersectionTest.cpp',
-        '../tests/PathOpsCubicIntersectionTestData.cpp',
-        '../tests/PathOpsCubicLineIntersectionTest.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/PathOpsLineIntersectionTest.cpp',
-        '../tests/PathOpsLineParametetersTest.cpp',
-        '../tests/PathOpsOpCubicThreadedTest.cpp',
-        '../tests/PathOpsOpRectThreadedTest.cpp',
-        '../tests/PathOpsOpTest.cpp',
-        '../tests/PathOpsQuadIntersectionTest.cpp',
-        '../tests/PathOpsQuadIntersectionTestData.cpp',
-        '../tests/PathOpsQuadLineIntersectionTest.cpp',
-        '../tests/PathOpsQuadLineIntersectionThreadedTest.cpp',
-        '../tests/PathOpsQuadParameterizationTest.cpp',
-        '../tests/PathOpsQuadReduceOrderTest.cpp',
-        '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp',
-        '../tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp',
-        '../tests/PathOpsSimplifyQuadThreadedTest.cpp',
-        '../tests/PathOpsSimplifyRectThreadedTest.cpp',
-        '../tests/PathOpsSimplifyTest.cpp',
-        '../tests/PathOpsSimplifyTrianglesThreadedTest.cpp',
-        '../tests/PathOpsTestCommon.cpp',
-        '../tests/PathOpsThreadedCommon.cpp',
-        '../tests/PathOpsCubicIntersectionTestData.h',
-        '../tests/PathOpsExtendedTest.h',
-        '../tests/PathOpsQuadIntersectionTestData.h',
-        '../tests/PathOpsTestCommon.h',
-        '../tests/PathOpsThreadedCommon.h',
         '../tests/Test.cpp',
         '../tests/skia_test.cpp',
         '../tests/Test.h',
diff --git a/gyp/pathops_unittest.gypi b/gyp/pathops_unittest.gypi
new file mode 100644
index 0000000000..fb26c6a555
--- /dev/null
+++ b/gyp/pathops_unittest.gypi
@@ -0,0 +1,42 @@
+{
+  'sources': [
+    '../tests/PathOpsBoundsTest.cpp',
+    '../tests/PathOpsCubicIntersectionTest.cpp',
+    '../tests/PathOpsCubicIntersectionTestData.cpp',
+    '../tests/PathOpsCubicLineIntersectionTest.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/PathOpsLineIntersectionTest.cpp',
+    '../tests/PathOpsLineParametetersTest.cpp',
+    '../tests/PathOpsOpCubicThreadedTest.cpp',
+    '../tests/PathOpsOpRectThreadedTest.cpp',
+    '../tests/PathOpsOpTest.cpp',
+    '../tests/PathOpsQuadIntersectionTest.cpp',
+    '../tests/PathOpsQuadIntersectionTestData.cpp',
+    '../tests/PathOpsQuadLineIntersectionTest.cpp',
+    '../tests/PathOpsQuadLineIntersectionThreadedTest.cpp',
+    '../tests/PathOpsQuadParameterizationTest.cpp',
+    '../tests/PathOpsQuadReduceOrderTest.cpp',
+    '../tests/PathOpsSimplifyDegenerateThreadedTest.cpp',
+    '../tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp',
+    '../tests/PathOpsSimplifyQuadThreadedTest.cpp',
+    '../tests/PathOpsSimplifyRectThreadedTest.cpp',
+    '../tests/PathOpsSimplifyTest.cpp',
+    '../tests/PathOpsSimplifyTrianglesThreadedTest.cpp',
+    '../tests/PathOpsTestCommon.cpp',
+    '../tests/PathOpsThreadedCommon.cpp',
+    '../tests/PathOpsCubicIntersectionTestData.h',
+    '../tests/PathOpsExtendedTest.h',
+    '../tests/PathOpsQuadIntersectionTestData.h',
+    '../tests/PathOpsTestCommon.h',
+    '../tests/PathOpsThreadedCommon.h',
+  ],
+}
diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index 68764cd1a2..b95b4a6a5a 100644
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -16,6 +16,10 @@
         '../src/utils',
         '../tools/',
       ],
+      'includes': [
+        'pathops.gypi',
+        'pathops_unittest.gypi',
+      ],
       'sources': [
         '../tests/AAClipTest.cpp',
         '../tests/AnnotationTest.cpp',