| Index: src/pathops/SkPathOpsTypes.h
|
| diff --git a/src/pathops/SkPathOpsTypes.h b/src/pathops/SkPathOpsTypes.h
|
| index 3b98c7b3afa679bff69b14d7b37de833c2fabd18..b336e58855839c5ccb8bb29a7c3b40b06b8a10e3 100644
|
| --- a/src/pathops/SkPathOpsTypes.h
|
| +++ b/src/pathops/SkPathOpsTypes.h
|
| @@ -184,7 +184,8 @@ private:
|
| };
|
|
|
| #ifdef SK_DEBUG
|
| -#define SkOPASSERT(cond) SkASSERT(this->globalState()->debugSkipAssert() || cond)
|
| +#define SkOPASSERT(cond) SkASSERT((this->globalState() && \
|
| + this->globalState()->debugSkipAssert()) || cond)
|
| #define SkOPOBJASSERT(obj, cond) SkASSERT((obj->debugGlobalState() && \
|
| obj->debugGlobalState()->debugSkipAssert()) || cond)
|
| #else
|
|
|