commit ba61029c5b4939fc33a8cd5db3e7e19c6742cc4b
author Cary Clark <caryclark@skia.org> Tue Jun 19 09:47:15 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 19 14:06:20 2018 +0000
tree ad8c5dde7857d18e6b06be5bf6a7dfab2499b04a
parent 8be6c33199ca926fafd01f0686a65684ed4a705b

fix op fuzz timeout

R=kjlubick@google.com
Bug:831647
Change-Id: I003ff28ac40ec81400570310bf6f6f1a08a925e5
Reviewed-on: https://skia-review.googlesource.com/134505
Commit-Queue: Cary Clark <caryclark@skia.org>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>

src/pathops/SkOpSegment.cpp

diff --git a/src/pathops/SkOpSegment.cpp b/src/pathops/SkOpSegment.cpp
index fd969f6..bfbf9dc 100644
--- a/src/pathops/SkOpSegment.cpp
+++ b/src/pathops/SkOpSegment.cpp
@@ -327,14 +327,15 @@
     this->markDone(span);
 }
 
-bool SkOpSegment::collapsed(double s, double e) const {
+SkOpSpanBase::Collapsed SkOpSegment::collapsed(double s, double e) const {
     const SkOpSpanBase* span = &fHead;
     do {
-        if (span->collapsed(s, e)) {
-            return true;
+        SkOpSpanBase::Collapsed result = span->collapsed(s, e);
+        if (SkOpSpanBase::Collapsed::kNo != result) {
+            return result;
         }
     } while (span->upCastable() && (span = span->upCast()->next()));
-    return false;
+    return SkOpSpanBase::Collapsed::kNo;
 }
 
 void SkOpSegment::ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,