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/SkPathOpsDebug.cpp

diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index a88f413..bfef403 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -1740,12 +1740,14 @@
     double coinTs, coinTe, oppTs, oppTe;
     coinTs = TRange(over1s, tStart, coinSeg  SkDEBUGPARAMS(over1e));
     coinTe = TRange(over1s, tEnd, coinSeg  SkDEBUGPARAMS(over1e));
-    if (coinSeg->collapsed(coinTs, coinTe)) {
+    SkOpSpanBase::Collapsed result = coinSeg->collapsed(coinTs, coinTe);
+    if (SkOpSpanBase::Collapsed::kNo != result) {
         return log->record(SkPathOpsDebug::kAddIfCollapsed_Glitch, coinSeg);
     }
     oppTs = TRange(over2s, tStart, oppSeg  SkDEBUGPARAMS(over2e));
     oppTe = TRange(over2s, tEnd, oppSeg  SkDEBUGPARAMS(over2e));
-    if (oppSeg->collapsed(oppTs, oppTe)) {
+    result = oppSeg->collapsed(oppTs, oppTe);
+    if (SkOpSpanBase::Collapsed::kNo != result) {
         return log->record(SkPathOpsDebug::kAddIfCollapsed_Glitch, oppSeg);
     }
     if (coinTs > coinTe) {
@@ -1753,7 +1755,8 @@
         swap(coinTs, coinTe);
         swap(oppTs, oppTe);
     }
-    return this->debugAddOrOverlap(log, coinSeg, oppSeg, coinTs, coinTe, oppTs, oppTe, added);
+    this->debugAddOrOverlap(log, coinSeg, oppSeg, coinTs, coinTe, oppTs, oppTe, added);
+    return;
 }
 
 /* Commented-out lines keep this in sync addOrOverlap() */