pathops coincidence and security rewrite

tests/PathOpsAngleIdeas.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "PathOpsTestCommon.h"
 #include "SkIntersections.h"
 #include "SkOpContour.h"
 #include "SkOpSegment.h"
@@ skipping 388 matching lines @@
 }
 
 static bool bruteForceCheck(skiatest::Reporter* reporter, const SkDQuad& quad1,
         const SkDQuad& quad2, bool ccw) {
     TRange lowerRange, upperRange;
     bool result = bruteMinT(reporter, quad1, quad2, &lowerRange, &upperRange);
     REPORTER_ASSERT(reporter, result);
     return ccw == upperRange.ccw;
 }
 
-static void makeSegment(SkOpContour* contour, const SkDQuad& quad, SkPoint shortQuad[3],
-        SkChunkAlloc* allocator) {
+static void makeSegment(SkOpContour* contour, const SkDQuad& quad, SkPoint shortQuad[3]) {
     shortQuad[0] = quad[0].asSkPoint();
     shortQuad[1] = quad[1].asSkPoint();
     shortQuad[2] = quad[2].asSkPoint();
-    contour->addQuad(shortQuad, allocator);
+    contour->addQuad(shortQuad);
 }
 
 static void testQuadAngles(skiatest::Reporter* reporter, const SkDQuad& quad1, const SkDQuad& quad2,
         int testNo, SkChunkAlloc* allocator) {
     SkPoint shortQuads[2][3];
 
     SkOpContourHead contour;
-    SkOpGlobalState state(nullptr, &contour  SkDEBUGPARAMS(false) SkDEBUGPARAMS(nullptr));
+    SkOpGlobalState state(&contour, allocator  SkDEBUGPARAMS(false) SkDEBUGPARAMS(nullptr));
     contour.init(&state, false, false);
-    makeSegment(&contour, quad1, shortQuads[0], allocator);
-    makeSegment(&contour, quad1, shortQuads[1], allocator);
+    makeSegment(&contour, quad1, shortQuads[0]);
+    makeSegment(&contour, quad1, shortQuads[1]);
     SkOpSegment* seg1 = contour.first();
-    seg1->debugAddAngle(0, 1, allocator);
+    seg1->debugAddAngle(0, 1);
     SkOpSegment* seg2 = seg1->next();
-    seg2->debugAddAngle(0, 1, allocator);
+    seg2->debugAddAngle(0, 1);
     int realOverlap = PathOpsAngleTester::ConvexHullOverlaps(*seg1->debugLastAngle(),
             *seg2->debugLastAngle());
     const SkDPoint& origin = quad1[0];
     REPORTER_ASSERT(reporter, origin == quad2[0]);
     double a1s = atan2(origin.fY - quad1[1].fY, quad1[1].fX - origin.fX);
     double a1e = atan2(origin.fY - quad1[2].fY, quad1[2].fX - origin.fX);
     double a2s = atan2(origin.fY - quad2[1].fY, quad2[1].fX - origin.fX);
     double a2e = atan2(origin.fY - quad2[2].fY, quad2[2].fX - origin.fX);
     bool oldSchoolOverlap = radianBetween(a1s, a2s, a1e)
         || radianBetween(a1s, a2e, a1e) || radianBetween(a2s, a1s, a2e)
@@ skipping 414 matching lines @@
             step /= 2;
         }
 #ifdef SK_DEBUG
 //        DumpQ(q1, q2, 999);
 #endif
     }
     if (gPathOpsAngleIdeasVerbose) {
         SkDebugf("maxR=%1.9g\n", maxR);
     }
 }