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/gpu/GrAllocator.h | |
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/gpu/GrAllocator.h')
-rw-r--r-- | src/gpu/GrAllocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h index 3305fb00c2..c5d2dc3d38 100644 --- a/src/gpu/GrAllocator.h +++ b/src/gpu/GrAllocator.h @@ -389,7 +389,7 @@ template <typename T> void* operator new(size_t size, GrTAllocator<T>* allocator // to match the op new silences warnings about missing op delete when a constructor throws an // exception. template <typename T> void operator delete(void*, GrTAllocator<T>*) { - SK_ABORT("Invalid Operation"); + SK_CRASH(); } #define GrNEW_APPEND_TO_ALLOCATOR(allocator_ptr, type_name, args) \ |