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 /tools | |
| 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 '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 557a2a51a2..12c1d35e1f 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); - SkASSERT_RELEASE(bar < SK_ARRAY_COUNT(kBars)); + SK_ALWAYSBREAK(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 0f8c96f617..af52b37a4e 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_ABORT(); + // SK_CRASH(); 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. |