| Index: include/gpu/GrConfig.h | 
| diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h | 
| index 95e518ab75a87b74a18ed3d20fe73b92c05932c0..df53fa2cebbfe1995986b8f367ecf2e7849fc87d 100644 | 
| --- a/include/gpu/GrConfig.h | 
| +++ b/include/gpu/GrConfig.h | 
| @@ -276,7 +276,6 @@ typedef unsigned __int64 uint64_t; | 
| /** | 
| *  Prettier forms of the above macros. | 
| */ | 
| -#define GrAssert(COND) GR_DEBUGASSERT(COND) | 
| #define GrAlwaysAssert(COND) GR_ALWAYSASSERT(COND) | 
|  | 
| /** | 
| @@ -285,8 +284,8 @@ typedef unsigned __int64 uint64_t; | 
| */ | 
| inline void GrCrash() { GrAlwaysAssert(false); } | 
| inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); } | 
| -inline void GrDebugCrash() { GrAssert(false); } | 
| -inline void GrDebugCrash(const char* msg) { GrPrintf(msg); GrAssert(false); } | 
| +inline void GrDebugCrash() { SkASSERT(false); } | 
| +inline void GrDebugCrash(const char* msg) { GrPrintf(msg); SkASSERT(false); } | 
|  | 
| /** | 
| *  GR_DEBUGCODE compiles the code X in debug builds only | 
|  |