fix bugs found by computing flat clips in 800K skps

src/pathops/SkOpAngle.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkOpAngle_DEFINED
 #define SkOpAngle_DEFINED
 
+#include "SkChunkAlloc.h"
 #include "SkLineParameters.h"
 
 class SkOpSegment;
 struct SkOpSpan;
 
 // sorting angles
 // given angles of {dx dy ddx ddy dddx dddy} sort them
 class SkOpAngle {
 public:
     enum { kStackBasedCount = 8 }; // FIXME: determine what this should be
@@ skipping 54 matching lines @@
     }
 
     // available to testing only
 #if DEBUG_SORT
     void debugLoop() const;  // called by code during run
 #endif
 #if DEBUG_ANGLE
     void debugSameAs(const SkOpAngle* compare) const;
 #endif
     void dump() const;
-    void dumpFromTo(const SkOpSegment* fromSeg, int from, int to) const;
+    void dumpLoop() const;
+    void dumpTo(const SkOpSegment* fromSeg, const SkOpAngle* ) const;
 
 #if DEBUG_ANGLE
+    int debugID() const { return fID; }
+
     void setID(int id) {
         fID = id;
     }
+#else
+    int debugID() const { return 0; }
 #endif
+
 #if DEBUG_VALIDATE
     void debugValidateLoop() const;
 #endif
 
 private:
     bool after(const SkOpAngle* test) const;
     int allOnOneSide(const SkOpAngle& test) const;
     bool calcSlop(double x, double y, double rx, double ry, bool* result) const;
     bool checkCrossesZero() const;
     bool checkParallel(const SkOpAngle& ) const;
@@ skipping 13 matching lines @@
 
     SkDCubic fCurvePart; // the curve from start to end
     double fSide;
     SkLineParameters fTangentHalf;  // used only to sort a pair of lines or line-like sections
     const SkOpSegment* fSegment;
     SkOpAngle* fNext;
     SkOpSpan* fLastMarked;
     SkDVector fSweep[2];
     int fStart;
     int fEnd;
+    int fComputedEnd;
     int fSectorMask;
     int8_t fSectorStart;  // in 32nds of a circle
     int8_t fSectorEnd;
     bool fIsCurve;
     bool fStop; // set if ordered angle is greater than the previous
     mutable bool fUnorderable;  // this is editable by orderable()
     bool fUnorderedSweep;  // set when a cubic's first control point between the sweep vectors
     bool fComputeSector;
     bool fComputedSector;
 
-#if DEBUG_SORT
-    void debugOne(bool showFunc) const;  // available to testing only
-#endif
 #if DEBUG_ANGLE
-    int debugID() const { return fID; }
     int fID;
 #endif
 #if DEBUG_VALIDATE
     void debugValidateNext() const;  // in debug builds, verify that angle loop is uncorrupted
 #else
     void debugValidateNext() const {}
 #endif
-    void dumpLoop() const;  // utility to be called by user from debugger
+    void dumpOne(bool showFunc) const;  // available to testing only
     void dumpPartials() const;  // utility to be called by user from debugger
     friend class PathOpsAngleTester;
 };
 
+class SkOpAngleSet {
+public:
+    SkOpAngleSet();
+    ~SkOpAngleSet();
+    SkOpAngle& push_back();
+    void reset();
+private:
+    void dump() const;  // utility to be called by user from debugger
+#if DEBUG_ANGLE
+    int fCount;
 #endif
+    SkChunkAlloc* fAngles;
+};
+
+#endif