diff options
author | djsollen <djsollen@google.com> | 2016-01-22 06:04:55 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-22 06:04:55 -0800 |
commit | 4c5cd7d527ed29aabfa72aa47b23a4496eeda357 (patch) | |
tree | 49959934e26882dd38d3bb1939f7c9b60d70f10d /bench | |
parent | 6d3cef930ad19b0f55543ca40f7a07030f4fe508 (diff) |
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
Review URL: https://codereview.chromium.org/1610823002
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 92e7da662f..bac7bddc81 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_CRASH(); return ""; + default: SK_ABORT("Invalid Type"); return ""; } } diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 4fc4044449..b461a63ee9 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()); - SK_ALWAYSBREAK(fCurrentScale < fScales.count()); // debugging paranoia + SkASSERT_RELEASE(fCurrentScale < fScales.count()); // debugging paranoia log->configOption("scale", SkStringPrintf("%.2g", fScales[fCurrentScale]).c_str()); if (fCurrentUseMPD > 0) { SkASSERT(1 == fCurrentUseMPD || 2 == fCurrentUseMPD); |