Improve assert reporting.

include/core/SkTypes.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTypes_DEFINED
 #define SkTypes_DEFINED
 
@@ skipping 121 matching lines @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #define SK_INIT_TO_AVOID_WARNING    = 0
 
 #ifndef SkDebugf
     SK_API void SkDebugf(const char format[], ...);
 #endif
 
-#define SkASSERT_RELEASE(cond)          if(!(cond)) { SK_ABORT(#cond); }
+#define SkASSERT_RELEASE(cond)          if (!(cond)) { SK_ABORT(#cond); }
 
 #ifdef SK_DEBUG
-    #if defined SK_BUILD_FOR_WIN
-        #define SkASSERT(cond)          if(!(cond)) { __debugbreak(); }
-    #else
-        #define SkASSERT(cond)          SkASSERT_RELEASE(cond)
-    #endif
-    #define SkDEBUGFAIL(message)        SkASSERT(false && message)
+    #define SkASSERT(cond)              if (!(cond)) { SK_ABORT("assert(" #cond ")"); }
+    #define SkASSERTF(cond, fmt, ...)   if (!(cond)) { \
+                                            SkDebugf(fmt"\n", __VA_ARGS__); \
+                                            SK_ABORT("assert(" #cond ")"); \
+                                        }
+    #define SkDEBUGFAIL(message)        SK_ABORT(message)
     #define SkDEBUGFAILF(fmt, ...)      SkASSERTF(false, fmt, ##__VA_ARGS__)
     #define SkDEBUGCODE(code)           code
     #define SkDECLAREPARAM(type, var)   , type var
     #define SkPARAM(var)                , var
-//  #define SkDEBUGF(args       )       SkDebugf##args
     #define SkDEBUGF(args       )       SkDebugf args
     #define SkAssertResult(cond)        SkASSERT(cond)
 #else
     #define SkASSERT(cond)
+    #define SkASSERTF(cond, fmt, ...)
     #define SkDEBUGFAIL(message)
     #define SkDEBUGCODE(code)
     #define SkDEBUGF(args)
     #define SkDECLAREPARAM(type, var)
     #define SkPARAM(var)
 
     // unlike SkASSERT, this guy executes its condition in the non-debug build.
     // The if is present so that this can be used with functions marked SK_WARN_UNUSED_RESULT.
     #define SkAssertResult(cond)         if (cond) {} do {} while(false)
 #endif
 
 // Legacy macro names for SK_ABORT
 #define SkFAIL(message)                 SK_ABORT(message)
 #define sk_throw()                      SK_ABORT("sk_throw")
 
-// We want to evaluate cond only once, and inside the SkASSERT somewhere so we see its string form.
-// So we use the comma operator to make an SkDebugf that always returns false: we'll evaluate cond,
-// and if it's true the assert passes; if it's false, we'll print the message and the assert fails.
-#define SkASSERTF(cond, fmt, ...)       SkASSERT((cond) || (SkDebugf(fmt"\n", __VA_ARGS__), false))
-
 #ifdef SK_IGNORE_TO_STRING
     #define SK_TO_STRING_NONVIRT()
     #define SK_TO_STRING_VIRT()
     #define SK_TO_STRING_PUREVIRT()
     #define SK_TO_STRING_OVERRIDE()
 #else
     class SkString;
     // the 'toString' helper functions convert Sk* objects to human-readable
     // form in developer mode
     #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const;
@@ skipping 526 matching lines @@
 
     void*       fPtr;
     size_t      fSize;  // can be larger than the requested size (see kReuse)
     uint32_t    fStorage[kSize >> 2];
 };
 // Can't guard the constructor because it's a template class.
 
 #endif /* C++ */
 
 #endif