Revert of harden pathops for pathological test

src/pathops/SkIntersections.h

Index: src/pathops/SkIntersections.h
diff --git a/src/pathops/SkIntersections.h b/src/pathops/SkIntersections.h
index 20823fac2b4782f30528151eb45f7104e4dc26c6..040671093c38bad841e5c70397bfb15328b40a39 100644
--- a/src/pathops/SkIntersections.h
+++ b/src/pathops/SkIntersections.h
@@ -16,7 +16,6 @@
 public:
     SkIntersections()
         : fSwap(0)
-        , fFlatMeasure(false)
 #ifdef SK_DEBUG
         , fDepth(0)
 #endif
@@ -40,10 +39,6 @@
     };
     TArray operator[](int n) const { return TArray(fT[n]); }
 
-    void allowFlatMeasure(bool flatAllowed) {
-        fFlatMeasure = flatAllowed;
-    }
-
     void allowNear(bool nearAllowed) {
         fAllowNear = nearAllowed;
     }
@@ -93,12 +88,8 @@
         cubic.set(a);
         SkDQuad quad;
         quad.set(b);
-        fMax = 7;
+        fMax = 6;
         return intersect(cubic, quad);
-    }
-
-    bool flatMeasure() const {
-        return fFlatMeasure;
     }
 
     bool hasT(double t) const {
@@ -210,7 +201,7 @@
     bool swapped() const {
         return fSwap;
     }
-    
+
     int used() const {
         return fUsed;
     }
@@ -223,7 +214,6 @@
         SkASSERT(++fDepth < 16);
     }
 
-    void alignQuadPts(const SkPoint a[3], const SkPoint b[3]);
     void append(const SkIntersections& );
     void cleanUpCoincidence();
     int coincidentUsed() const;
@@ -292,7 +282,6 @@
     unsigned char fMax;
     bool fAllowNear;
     bool fSwap;
-    bool fFlatMeasure;  // backwards-compatibility when cubics uses quad intersection
 #ifdef SK_DEBUG
     int fDepth;
 #endif