update pathops to circle sort

src/pathops/SkIntersectionHelper.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.
  */
 #include "SkOpContour.h"
 #include "SkPath.h"
 
 #ifdef SK_DEBUG
@@ skipping 28 matching lines @@
 
     // Avoid collapsing t values that are close to the same since
     // we walk ts to describe consecutive intersections. Since a pair of ts can
     // be nearly equal, any problems caused by this should be taken care
     // of later.
     // On the edge or out of range values are negative; add 2 to get end
     int addT(const SkIntersectionHelper& other, const SkPoint& pt, double newT) {
         return fContour->addT(fIndex, other.fContour, other.fIndex, pt, newT);
     }
 
-    int addSelfT(const SkIntersectionHelper& other, const SkPoint& pt, double newT) {
-        return fContour->addSelfT(fIndex, other.fContour, other.fIndex, pt, newT);
+    int addSelfT(const SkPoint& pt, double newT) {
+        return fContour->addSelfT(fIndex, pt, newT);
     }
 
     bool advance() {
         return ++fIndex < fLast;
     }
 
     SkScalar bottom() const {
         return bounds().fBottom;
     }
 
@@ skipping 73 matching lines @@
     }
 
     SkScalar y() const {
         return bounds().fTop;
     }
 
     bool yFlipped() const {
         return y() != pts()[0].fY;
     }
 
-#ifdef SK_DEBUG
-    void dump() {
-        SkDPoint::dump(pts()[0]);
-        SkDPoint::dump(pts()[1]);
-        if (verb() >= SkPath::kQuad_Verb) {
-            SkDPoint::dump(pts()[2]);
-        }
-        if (verb() >= SkPath::kCubic_Verb) {
-            SkDPoint::dump(pts()[3]);
-        }
-    }
-#endif
+private:
+    // utility callable by the user from the debugger when the implementation code is linked in
+    void dump() const;
 
-private:
     SkOpContour* fContour;
     int fIndex;
     int fLast;
 };