diff options
| author |  djsollen <djsollen@google.com> | 2016-01-29 08:51:04 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-29 08:51:04 -0800 |
| commit | f2b340fc885ad2a12d2d73974eff9c8f4c94192c (patch) | |
| tree | 1fbe8cefea121d557efb099ceea8c5fae0ac5e1e /tools | |
| parent | 2a1d401bf2d500bab225b78a20cb6f16b2c67efb (diff) | |
Consolidate SK_CRASH and sk_throw into SK_ABORT
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1648343003
Review URL: https://codereview.chromium.org/1648343003
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Stats.h | 2 | ||||
| -rw-r--r-- | tools/sk_tool_utils_font.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/Stats.h b/tools/Stats.h index 12c1d35e1f..557a2a51a2 100644 --- a/tools/Stats.h +++ b/tools/Stats.h @@ -62,7 +62,7 @@ struct Stats { s /= (max - min); s *= (SK_ARRAY_COUNT(kBars) - 1); const size_t bar = (size_t)(s + 0.5); - SK_ALWAYSBREAK(bar < SK_ARRAY_COUNT(kBars)); + SkASSERT_RELEASE(bar < SK_ARRAY_COUNT(kBars)); plot.append(kBars[bar]); } } diff --git a/tools/sk_tool_utils_font.cpp b/tools/sk_tool_utils_font.cpp index af52b37a4e..0f8c96f617 100644 --- a/tools/sk_tool_utils_font.cpp +++ b/tools/sk_tool_utils_font.cpp @@ -42,7 +42,7 @@ SkTypeface* create_font(const char* name, SkTypeface::Style style) { } if (!fontData) { // Once all legacy callers to portable fonts are converted, replace this with - // SK_CRASH(); + // SK_ABORT(); SkDebugf("missing %s %d\n", name, style); // If we called SkTypeface::CreateFromName() here we'd recurse infinitely, // so we reimplement its core logic here inline without the recursive aspect. |