| Index: src/pathops/SkDConicLineIntersection.cpp | 
| diff --git a/src/pathops/SkDConicLineIntersection.cpp b/src/pathops/SkDConicLineIntersection.cpp | 
| index e6d775f76e1b17a62ceb3fcbf17affdfbcc68e44..2d906072fa549f79bca75a96a5323d234dd1df15 100644 | 
| --- a/src/pathops/SkDConicLineIntersection.cpp | 
| +++ b/src/pathops/SkDConicLineIntersection.cpp | 
| @@ -103,9 +103,14 @@ public: | 
| for (int index = 0; index < roots; ++index) { | 
| double conicT = rootVals[index]; | 
| double lineT = this->findLineT(conicT); | 
| -            SkDEBUGCODE(SkDPoint conicPt = fConic.ptAtT(conicT)); | 
| -            SkDEBUGCODE(SkDPoint linePt = fLine->ptAtT(lineT)); | 
| -            SkASSERT(conicPt.approximatelyEqual(linePt)); | 
| +#ifdef SK_DEBUG | 
| +            if (!fIntersections->debugGlobalState() | 
| +                    || !fIntersections->debugGlobalState()->debugSkipAssert()) { | 
| +                SkDEBUGCODE(SkDPoint conicPt = fConic.ptAtT(conicT)); | 
| +                SkDEBUGCODE(SkDPoint linePt = fLine->ptAtT(lineT)); | 
| +                SkASSERT(conicPt.approximatelyEqual(linePt)); | 
| +            } | 
| +#endif | 
| SkDPoint pt; | 
| if (this->pinTs(&conicT, &lineT, &pt, kPointUninitialized) | 
| && this->uniqueAnswer(conicT, pt)) { | 
|  |