aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/core/SkScalar.h2
-rw-r--r--include/core/SkTypes.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h
index d5cd718652..71aad98919 100644
--- a/include/core/SkScalar.h
+++ b/include/core/SkScalar.h
@@ -92,7 +92,7 @@
*
* Either way, it's not good.
*/
- SkASSERT(!"looks like you passed an SkScalar into SkIntToScalar");
+ SkDEBUGFAIL("looks like you passed an SkScalar into SkIntToScalar");
return (float)0;
}
#else // not SK_DEBUG
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 51d8d187c7..a5844213d2 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -93,6 +93,7 @@ inline void operator delete(void* p) {
#ifdef SK_DEBUG
#define SkASSERT(cond) SK_DEBUGBREAK(cond)
+ #define SkDEBUGFAIL(message) SkASSERT(false && message)
#define SkDEBUGCODE(code) code
#define SkDECLAREPARAM(type, var) , type var
#define SkPARAM(var) , var
@@ -101,6 +102,7 @@ inline void operator delete(void* p) {
#define SkAssertResult(cond) SkASSERT(cond)
#else
#define SkASSERT(cond)
+ #define SkDEBUGFAIL(message)
#define SkDEBUGCODE(code)
#define SkDEBUGF(args)
#define SkDECLAREPARAM(type, var)