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 /bench | |
| 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 'bench')
| -rw-r--r-- | bench/ChecksumBench.cpp | 2 | ||||
| -rw-r--r-- | bench/nanobench.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bench/ChecksumBench.cpp b/bench/ChecksumBench.cpp index bac7bddc81..92e7da662f 100644 --- a/bench/ChecksumBench.cpp +++ b/bench/ChecksumBench.cpp @@ -45,7 +45,7 @@ protected: case kSHA1_ChecksumType: return "compute_sha1"; case kMurmur3_ChecksumType: return "compute_murmur3"; - default: SK_ABORT("Invalid Type"); return ""; + default: SK_CRASH(); return ""; } } diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index b461a63ee9..4fc4044449 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -947,7 +947,7 @@ public: log->configOption("clip", SkStringPrintf("%d %d %d %d", fClip.fLeft, fClip.fTop, fClip.fRight, fClip.fBottom).c_str()); - SkASSERT_RELEASE(fCurrentScale < fScales.count()); // debugging paranoia + SK_ALWAYSBREAK(fCurrentScale < fScales.count()); // debugging paranoia log->configOption("scale", SkStringPrintf("%.2g", fScales[fCurrentScale]).c_str()); if (fCurrentUseMPD > 0) { SkASSERT(1 == fCurrentUseMPD || 2 == fCurrentUseMPD); |