diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-08-16 10:53:04 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-16 15:37:54 +0000 |
| commit | b4aab9ae6d27c446af8302b79d15b832c816c633 (patch) | |
| tree | 27e7f87a7a5e3d61990bc2742d9b9f167d26e0c3 /gm | |
| parent | edf3dc094b0fc55bfc932539da1127484051b474 (diff) | |
Replace SkFAIL with SK_ABORT.
SkFAIL is a legacy macro which is just SK_ABORT. This CL mechanically
changes uses of SkFAIL to SK_ABORT in preparation for its removal. The
related sk_throw macro will be changed independently, due to needing to
actually clean up its users.
Change-Id: Id70b5c111a02d2458dc60c8933f444df27d9cebb
Reviewed-on: https://skia-review.googlesource.com/35284
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/aaxfermodes.cpp | 2 | ||||
| -rw-r--r-- | gm/all_bitmap_configs.cpp | 2 | ||||
| -rw-r--r-- | gm/glyph_pos_align.cpp | 2 | ||||
| -rw-r--r-- | gm/occludedrrectblur.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp index eab68b4e81..1420e3d579 100644 --- a/gm/aaxfermodes.cpp +++ b/gm/aaxfermodes.cpp @@ -259,7 +259,7 @@ protected: break; default: - SkFAIL("Invalid shape."); + SK_ABORT("Invalid shape."); } } diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp index 32fb86c9cd..699a55bfd2 100644 --- a/gm/all_bitmap_configs.cpp +++ b/gm/all_bitmap_configs.cpp @@ -195,7 +195,7 @@ static uint32_t make_pixel(int x, int y, SkAlphaType alphaType) { component = 0xFF; break; default: - SkFAIL("Should not get here - invalid alpha type"); + SK_ABORT("Should not get here - invalid alpha type"); return 0xFF000000; } return alpha << 24 | component; diff --git a/gm/glyph_pos_align.cpp b/gm/glyph_pos_align.cpp index e0bf83e4f2..50bcf82742 100644 --- a/gm/glyph_pos_align.cpp +++ b/gm/glyph_pos_align.cpp @@ -51,7 +51,7 @@ void drawTestCase(SkCanvas* canvas, const char* text, SkScalar y, const SkPaint& case SkPaint::kRight_Align: originX = 1; break; case SkPaint::kCenter_Align: originX = 0.5f; break; case SkPaint::kLeft_Align: originX = 0; break; - default: SkFAIL("Invalid paint origin"); return; + default: SK_ABORT("Invalid paint origin"); return; } float x = kTextHeight; diff --git a/gm/occludedrrectblur.cpp b/gm/occludedrrectblur.cpp index f488f22028..b43f451490 100644 --- a/gm/occludedrrectblur.cpp +++ b/gm/occludedrrectblur.cpp @@ -90,7 +90,7 @@ static void draw_45(SkCanvas* canvas, SkRRect::Corner corner, dir.set(-SK_ScalarRoot2Over2, SK_ScalarRoot2Over2); break; default: - SkFAIL("Invalid shape."); + SK_ABORT("Invalid shape."); } SkRect r = SkRect::MakeWH(kSize, kSize); @@ -196,7 +196,7 @@ static void draw_30_60(SkCanvas* canvas, SkRRect::Corner corner, const SkVector& right = SkRRect::kUpperLeft_Corner; break; default: - SkFAIL("Invalid shape."); + SK_ABORT("Invalid shape."); } SkIRect r; |