interpolation of coincidence must be local to a single span

src/pathops/SkOpCoincidence.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkOpCoincidence_DEFINED
 #define SkOpCoincidence_DEFINED
 
 #include "SkTDArray.h"
@@ skipping 232 matching lines @@
     bool addEndMovedSpans(const SkOpSpan* base, const SkOpSpanBase* testSpan);
     bool addEndMovedSpans(const SkOpPtT* ptT);
 
     bool addIfMissing(const SkCoincidentSpans* outer, SkOpPtT* over1s, SkOpPtT* over1e);
 
     bool addIfMissing(const SkCoincidentSpans* outer, const SkOpPtT* over1s,
                       const SkOpPtT* over1e) {
         return addIfMissing(outer, const_cast<SkOpPtT*>(over1s), const_cast<SkOpPtT*>(over1e));
     }
 
-    bool addIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e,
-                      const SkOpPtT* over2s, const SkOpPtT* over2e,
-                      double tStart, double tEnd,
-                      SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
-                      SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd);
-
-    bool addIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e,
-                      const SkOpPtT* over2s, const SkOpPtT* over2e,
-                      double tStart, double tEnd,
-                      const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
-                      const SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd) {
-        return addIfMissing(over1s, over1e, over2s, over2e, tStart, tEnd,
-                const_cast<SkOpPtT*>(coinPtTStart), coinPtTEnd,
-                const_cast<SkOpPtT*>(oppPtTStart), oppPtTEnd);
-    }
-
+    bool addIfMissing(const SkOpPtT* over1s, const SkOpPtT* over2s,
+                      double tStart, double tEnd, SkOpSegment* coinSeg, SkOpSegment* oppSeg
+                      SkDEBUGPARAMS(const SkOpPtT* over1e) SkDEBUGPARAMS(const SkOpPtT* over2e));
     bool addOrOverlap(SkOpSegment* coinSeg, SkOpSegment* oppSeg,
                       double coinTs, double coinTe, double oppTs, double oppTe
                       SkDEBUGPARAMS(bool callerAborts));
     bool addOverlap(const SkOpSegment* seg1, const SkOpSegment* seg1o,
                     const SkOpSegment* seg2, const SkOpSegment* seg2o,
                     const SkOpPtT* overS, const SkOpPtT* overE);
     bool alreadyAdded(const SkCoincidentSpans* check, const SkCoincidentSpans* outer,
                       const SkOpPtT* over1s, const SkOpPtT* over1e) const;
     bool checkOverlap(SkCoincidentSpans* check,
                       const SkOpSegment* coinSeg, const SkOpSegment* oppSeg,
                       double coinTs, double coinTe, double oppTs, double oppTe,
                       SkTDArray<SkCoincidentSpans*>* overlaps) const;
     bool contains(const SkOpSegment* seg, const SkOpSegment* opp, double oppT) const;
     bool contains(const SkCoincidentSpans* coin, const SkOpSegment* seg,
                   const SkOpSegment* opp, double oppT) const;
 #if DEBUG_COINCIDENCE_VERBOSE
-    void debugAddIfMissing(const SkCoincidentSpans* outer, const SkOpPtT* over1s,
-                           const SkOpPtT* over1e, const char* id, SkPathOpsDebug::GlitchLog*) const;
-    void debugAddIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e,
-                           const SkOpPtT* over2s, const SkOpPtT* over2e,
+    void debugAddIfMissing(const char* id, SkPathOpsDebug::GlitchLog* ,
+                           const SkCoincidentSpans* outer, const SkOpPtT* over1s,
+                           const SkOpPtT* over1e) const;
+    void debugAddIfMissing(const char* id, SkPathOpsDebug::GlitchLog* ,
+                           const SkOpPtT* over1s, const SkOpPtT* over2s,
                            double tStart, double tEnd,
-                           const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
-                           const SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd,
-                           const char* id, SkPathOpsDebug::GlitchLog*) const;
+                           const SkOpSegment* coinSeg, const SkOpSegment* oppSeg,
+                           const SkOpPtT* over1e, const SkOpPtT* over2e) const;
 #endif
     void fixUp(SkCoincidentSpans* coin, SkOpPtT* deleted, const SkOpPtT* kept);
     void markCollapsed(SkCoincidentSpans* head, SkOpPtT* test);
     bool overlap(const SkOpPtT* coinStart1, const SkOpPtT* coinEnd1,
                  const SkOpPtT* coinStart2, const SkOpPtT* coinEnd2,
                  double* overS, double* overE) const;
     bool release(SkCoincidentSpans* coin, SkCoincidentSpans* );
     void releaseDeleted(SkCoincidentSpans* );
     void restoreHead();
     bool testForCoincidence(const SkCoincidentSpans* outer, const SkOpPtT* testS,
                             const SkOpPtT* testE) const;
-    static void TRange(const SkOpPtT* overS, const SkOpPtT* overE, double tStart,
-                       double tEnd, const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
-                       double* coinTs, double* coinTe);
+    // return coinPtT->segment()->t mapped from overS->fT <= t <= overE->fT
+    static double TRange(const SkOpPtT* overS, double t, const SkOpSegment* coinPtT
+                         SkDEBUGPARAMS(const SkOpPtT* overE));
 
     SkCoincidentSpans* fHead;
     SkCoincidentSpans* fTop;
     SkOpGlobalState* fGlobalState;
     bool fContinue;
     bool fSpanDeleted;
     bool fPtAllocated;
     bool fCoinExtended;
     bool fSpanMerged;
 };
 
 #endif