aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-08-17 09:15:28 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-17 13:42:06 +0000
commit824e730789e8535b7d0ee13dd2cd53674e19405f (patch)
treed9a6480488b87dbcda2fe4ae32bd37b4fa55abfa
parentdb68a426b6ba3a0fa1cace25ac306037eb7413a6 (diff)
Remove SkFAIL.
This macro just forwards to SK_ABORT. It appears there are now no users. Change-Id: I25a736790d7799b8ff51d879a823ee1b6b9cb47e Reviewed-on: https://skia-review.googlesource.com/35760 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
-rw-r--r--include/core/SkTypes.h1
-rw-r--r--include/private/GrTypesPriv.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 1dd672bea4..d24e30de07 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -115,7 +115,6 @@ inline void operator delete(void* p) {
#endif
// Legacy macro names for SK_ABORT
-#define SkFAIL(message) SK_ABORT(message)
#define sk_throw() SK_ABORT("sk_throw")
#ifdef SK_IGNORE_TO_STRING
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index b83a73343d..1536f7b229 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -356,7 +356,7 @@ static inline bool GrSLTypeAcceptsPrecision(GrSLType type) {
case kInt4_GrSLType:
return false;
}
- SkFAIL("Unexpected type");
+ SK_ABORT("Unexpected type");
return false;
}