fix some pathops bugs found in 1M skps

src/pathops/SkOpSpan.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 SkOpSpan_DEFINED
 #define SkOpSpan_DEFINED
 
 #include "SkPathOpsDebug.h"
@@ skipping 40 matching lines @@
     bool collapsed(const SkOpPtT* ) const;
     bool contains(const SkOpPtT* ) const;
     SkOpPtT* contains(const SkOpSegment* );
     SkOpContour* contour() const;
 
     int debugID() const {
         return SkDEBUGRELEASE(fID, -1);
     }
 
     const SkOpAngle* debugAngle(int id) const;
+    bool debugContains(const SkOpPtT* ) const;
+    const SkOpPtT* debugContains(const SkOpSegment* check) const;
     SkOpContour* debugContour(int id);
     int debugLoopLimit(bool report) const;
     bool debugMatchID(int id) const;
     const SkOpPtT* debugPtT(int id) const;
     const SkOpSegment* debugSegment(int id) const;
     const SkOpSpanBase* debugSpan(int id) const;
-    SkOpGlobalState* globalState() const;
     void debugValidate() const;
 
     bool deleted() const {
         return fDeleted;
     }
 
     SkOpPtT* doppelganger();
 
     bool duplicate() const {
         return fDuplicatePt;
     }
 
     void dump() const;  // available to testing only
     void dumpAll() const;
     void dumpBase() const;
 
     SkOpPtT* find(SkOpSegment* );
+    SkOpGlobalState* globalState() const;
     void init(SkOpSpanBase* , double t, const SkPoint& , bool dup);
 
     void insert(SkOpPtT* span) {
         SkASSERT(span != this);
         span->fNext = fNext;
         fNext = span;
     }
 
     const SkOpPtT* next() const {
         return fNext;
@@ skipping 102 matching lines @@
     SkOpContour* contour() const;
 
     int debugBumpCount() {
         return SkDEBUGRELEASE(++fCount, -1);
     }
 
     int debugID() const {
         return SkDEBUGRELEASE(fID, -1);
     }
 
+    bool debugAlignedEnd(double t, const SkPoint& pt) const;
+    bool debugAlignedInner() const;
     const SkOpAngle* debugAngle(int id) const;
     bool debugCoinEndLoopCheck() const;
+    bool debugContains(const SkOpSegment* ) const;
     SkOpContour* debugContour(int id);
     const SkOpPtT* debugPtT(int id) const;
     const SkOpSegment* debugSegment(int id) const;
     const SkOpSpanBase* debugSpan(int id) const;
+    const SkOpSpan* debugStarter(SkOpSpanBase const** endPtr) const;
     SkOpGlobalState* globalState() const;
     void debugValidate() const;
 
     bool deleted() const {
         return fPtT.deleted();
     }
 
     void dump() const;  // available to testing only
     void dumpCoin() const;
     void dumpAll() const;
@@ skipping 273 matching lines @@
     SkOpSpanBase* fNext;  // next intersection point
     int fWindSum;  // accumulated from contours surrounding this one.
     int fOppSum;  // for binary operators: the opposite winding sum
     int fWindValue;  // 0 == canceled; 1 == normal; >1 == coincident
     int fOppValue;  // normally 0 -- when binary coincident edges combine, opp value goes here
     int fTopTTry; // specifies direction and t value to try next
     bool fDone;  // if set, this span to next higher T has been processed
 };
 
 #endif