diff options
author | bungeman <bungeman@google.com> | 2016-07-20 09:49:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-20 09:49:10 -0700 |
commit | 1f790aaeef47b02fe72b9b62d1e8c7ead85ae442 (patch) | |
tree | 2e92ff5faf5d68d7a439fd720feaedbe0292b26b /src/ports/SkMemory_malloc.cpp | |
parent | ea70c4bb22394c8dcc29a369d3422a2b8f3b3e80 (diff) |
Improve assert reporting.
Make SkASSERTF output readable.
Ensure the assert predicate is stringified once.
Make the abort code consistent.
TBR=reed
This doesn't change any public API, most of this should be privatized.
Review-Url: https://codereview.chromium.org/2161103002
Diffstat (limited to 'src/ports/SkMemory_malloc.cpp')
-rw-r--r-- | src/ports/SkMemory_malloc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp index 2fc59f9b92..f06dc35ea6 100644 --- a/src/ports/SkMemory_malloc.cpp +++ b/src/ports/SkMemory_malloc.cpp @@ -31,7 +31,11 @@ void sk_abort_no_print() { // do not display a system dialog before aborting the process _set_abort_behavior(0, _WRITE_ABORT_MSG); #endif +#if defined(SK_DEBUG) && defined(SK_BUILD_FOR_WIN) + __debugbreak(); +#else abort(); +#endif } void sk_out_of_memory(void) { |