diff options
| author |  djsollen <djsollen@google.com> | 2016-01-22 06:50:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-22 06:50:25 -0800 |
| commit | aa97a84404c7505738713a4c19b42347c7daef9e (patch) | |
| tree | c78f46c5226d73ffeb29e828d60eed196fa7f21d /src/ports/SkMemory_mozalloc.cpp | |
| parent | 7df3f5e127f8016d17b637cc48a6a4718f1a6822 (diff) | |
Revert of Consolidate SK_CRASH and sk_throw into SK_ABORT (patchset #5 id:80001 of https://codereview.chromium.org/1610823002/ )
Reason for revert:
Chrome is calling SK_CRASH
Original issue's description:
> Consolidate SK_CRASH and sk_throw into SK_ABORT
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1610823002
>
> Committed: https://skia.googlesource.com/skia/+/4c5cd7d527ed29aabfa72aa47b23a4496eeda357
TBR=reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1620333002
Diffstat (limited to 'src/ports/SkMemory_mozalloc.cpp')
| -rw-r--r-- | src/ports/SkMemory_mozalloc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ports/SkMemory_mozalloc.cpp b/src/ports/SkMemory_mozalloc.cpp index f8a996307e..f070085893 100644 --- a/src/ports/SkMemory_mozalloc.cpp +++ b/src/ports/SkMemory_mozalloc.cpp @@ -12,8 +12,9 @@ #include "mozilla/mozalloc_abort.h" #include "mozilla/mozalloc_oom.h" -void sk_abort_no_print() { - mozalloc_abort("Abort from sk_abort"); +void sk_throw() { + SkDEBUGFAIL("sk_throw"); + mozalloc_abort("Abort from sk_throw"); } void sk_out_of_memory(void) { |