Index: src/pathops/SkPathOpsOp.cpp |
diff --git a/src/pathops/SkPathOpsOp.cpp b/src/pathops/SkPathOpsOp.cpp |
index 257cb8ee69b646bc127825e2a82c518794750137..b71ca9e481e98a5a33ad5d49b31593635064d85b 100644 |
--- a/src/pathops/SkPathOpsOp.cpp |
+++ b/src/pathops/SkPathOpsOp.cpp |
@@ -246,12 +246,13 @@ extern void (*gVerboseFinalize)(); |
#endif |
bool OpDebug(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result, |
- bool expectSuccess SkDEBUGPARAMS(const char* testName)) { |
+ bool expectSuccess SkDEBUGPARAMS(bool skipAssert) SkDEBUGPARAMS(const char* testName)) { |
SkChunkAlloc allocator(4096); // FIXME: add a constant expression here, tune |
SkOpContour contour; |
SkOpContourHead* contourList = static_cast<SkOpContourHead*>(&contour); |
SkOpCoincidence coincidence; |
- SkOpGlobalState globalState(&coincidence, contourList SkDEBUGPARAMS(testName)); |
+ SkOpGlobalState globalState(&coincidence, contourList |
+ SkDEBUGPARAMS(skipAssert) SkDEBUGPARAMS(testName)); |
#if DEBUGGING_PATHOPS_FROM_HOST |
dump_op(one, two, op); |
#endif |
@@ -454,6 +455,6 @@ bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) { |
} |
return true; |
#else |
- return OpDebug(one, two, op, result, true SkDEBUGPARAMS(nullptr)); |
+ return OpDebug(one, two, op, result, true SkDEBUGPARAMS(false) SkDEBUGPARAMS(nullptr)); |
#endif |
} |