fix multiple intersection logic

When three or more curves intersect at the same point, ensure that
each curve records the intersections of the others. This fixes a
number of cubic tests.

TBR=reed@google.com
BUG=skia:3588

Review URL: https://codereview.chromium.org/1105943002

1 files changed, 10 insertions, 4 deletions

diff --git a/src/pathops/SkOpContour.h b/src/pathops/SkOpContour.h
index c86f27b22e..3d26ae84c8 100644
--- a/src/pathops/SkOpContour.h
+++ b/src/pathops/SkOpContour.h
@@ -211,17 +211,23 @@ public:
         } while ((segment = segment->next()));
     }
 
-    bool moveNearby() {
+    bool moveMultiples() {
         SkASSERT(fCount > 0);
         SkOpSegment* segment = &fHead;
         do {
-            if (!segment->moveNearby()) {
-                return false;
-            }
+            segment->moveMultiples();
         } while ((segment = segment->next()));
         return true;
     }
 
+    void moveNearby() {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->moveNearby();
+        } while ((segment = segment->next()));
+    }
+
     SkOpContour* next() {
         return fNext;
     }