aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2016-02-04 08:59:35 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-04 08:59:35 -0800
commit6b48984333029f2ad94a06339b2329bda8ee09ba (patch)
tree61a5e2544b0ed31bb0804af20fa33b5653426ef3
parent0bd103497a21c2cb30fd5382cedb706cbf4941fa (diff)
Don't print dialog box prior to crashing.
This returns us to our previous behavior when we used 0xbbadbeef to cause the process to terminate. BUG=skia:4893 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1667113002 Review URL: https://codereview.chromium.org/1667113002
-rw-r--r--src/ports/SkMemory_malloc.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp
index 008352ec4a..9fc17b7c34 100644
--- a/src/ports/SkMemory_malloc.cpp
+++ b/src/ports/SkMemory_malloc.cpp
@@ -27,6 +27,10 @@ static inline void* throw_on_failure(size_t size, void* p) {
}
void sk_abort_no_print() {
+#ifdef SK_BUILD_FOR_WIN
+ // do not display a system dialog before aborting the process
+ _set_abort_behavior(0, _WRITE_ABORT_MSG);
+#endif
abort();
}