pathops tiger checkpoint

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 408 matching lines @@
 class SkOpSpan : public SkOpSpanBase {
 public:
     bool alreadyAdded() const {
         if (fAlreadyAdded) {
             return true;
         }
         fAlreadyAdded = true;
         return false;
     }
 
+    bool checkAlreadyAdded() const {
+        return fAlreadyAdded;
+    }
+
     bool clearCoincident() {
         SkASSERT(!final());
         if (fCoincident == this) {
             return false;
         }
         fCoincident = this;
         return true;
     }
 
     int computeWindSum();
@@ skipping 18 matching lines @@
 #endif
     void dumpCoin() const;
     bool dumpSpan() const;
 
     bool done() const {
         SkASSERT(!final());
         return fDone;
     }
 
     void init(SkOpSegment* parent, SkOpSpan* prev, double t, const SkPoint& pt);
-    bool insertCoincidence(const SkOpSegment* , bool flipped);
+    bool insertCoincidence(const SkOpSegment* , bool flipped, bool ordered);
 
     // Please keep this in sync with debugInsertCoincidence()
     void insertCoincidence(SkOpSpan* coin) {
         if (containsCoincidence(coin)) {
             SkASSERT(coin->containsCoincidence(this));
             return;
         }
         debugValidate();
         SkASSERT(this != coin);
         SkOpSpan* coinNext = coin->fCoincident;
@@ skipping 89 matching lines @@
     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
     mutable bool fAlreadyAdded;
 };
 
 #endif