aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/SkPath.cpp2
-rw-r--r--src/core/SkRegionPriv.h2
-rw-r--r--src/device/xps/SkXPSDevice.cpp3
-rw-r--r--src/gpu/GrAllocator.h2
-rw-r--r--src/gpu/GrTRecorder.h2
-rw-r--r--src/pathops/SkPathOpsDebug.cpp4
-rw-r--r--src/ports/SkFontHost_win.cpp2
-rw-r--r--src/ports/SkFontMgr_fontconfig.cpp2
-rw-r--r--src/ports/SkFontMgr_win_dw.cpp2
-rw-r--r--src/ports/SkMemory_malloc.cpp3
-rw-r--r--src/ports/SkMemory_mozalloc.cpp5
-rw-r--r--src/ports/SkTypeface_win_dw.cpp2
-rw-r--r--src/ports/SkTypeface_win_dw.h2
13 files changed, 18 insertions, 15 deletions
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 33b7451424..c77a25b4aa 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -275,7 +275,7 @@ bool SkPath::conservativelyContainsRect(const SkRect& rect) const {
orig.set(pts, iter.conicWeight());
SkPoint quadPts[5];
int count = orig.chopIntoQuadsPOW2(quadPts, 1);
- SkASSERT_RELEASE(2 == count);
+ SK_ALWAYSBREAK(2 == count);
if (!check_edge_against_rect(quadPts[0], quadPts[2], rect, direction)) {
return false;
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index c9633c7ad6..160c55d555 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -66,7 +66,7 @@ public:
SkASSERT(count >= SkRegion::kRectRegionRuns);
const int64_t size = sk_64_mul(count, sizeof(RunType)) + sizeof(RunHead);
- if (count < 0 || !sk_64_isS32(size)) { SK_ABORT("Invalid Size"); }
+ if (count < 0 || !sk_64_isS32(size)) { SK_CRASH(); }
RunHead* head = (RunHead*)sk_malloc_throw(size);
head->fRefCnt = 1;
diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp
index e4ac2aa742..48233bb554 100644
--- a/src/device/xps/SkXPSDevice.cpp
+++ b/src/device/xps/SkXPSDevice.cpp
@@ -2044,7 +2044,7 @@ static int num_glyph_guess(SkPaint::TextEncoding encoding, const void* text, siz
case SkPaint::kGlyphID_TextEncoding:
return SkToInt(byteLength / 2);
default:
- SK_ABORT("Invalid Text Encoding");
+ SK_ALWAYSBREAK(true);
}
return 0;
}
@@ -2254,6 +2254,7 @@ SkBaseDevice* SkXPSDevice::onCreateDevice(const CreateInfo& info, const SkPaint*
#if 0
if (SkBaseDevice::kGeneral_Usage == info.fUsage) {
return nullptr;
+ SK_CRASH();
//To what stream do we write?
//SkXPSDevice* dev = new SkXPSDevice(this);
//SkSize s = SkSize::Make(width, height);
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h
index 3305fb00c2..c5d2dc3d38 100644
--- a/src/gpu/GrAllocator.h
+++ b/src/gpu/GrAllocator.h
@@ -389,7 +389,7 @@ template <typename T> void* operator new(size_t size, GrTAllocator<T>* allocator
// to match the op new silences warnings about missing op delete when a constructor throws an
// exception.
template <typename T> void operator delete(void*, GrTAllocator<T>*) {
- SK_ABORT("Invalid Operation");
+ SK_CRASH();
}
#define GrNEW_APPEND_TO_ALLOCATOR(allocator_ptr, type_name, args) \
diff --git a/src/gpu/GrTRecorder.h b/src/gpu/GrTRecorder.h
index c42d9e9751..a838ad2955 100644
--- a/src/gpu/GrTRecorder.h
+++ b/src/gpu/GrTRecorder.h
@@ -378,7 +378,7 @@ template <typename TBase, typename TAlign, typename TItem>
void operator delete(void*, GrTRecorder<TBase, TAlign>&, const GrTRecorderAllocWrapper<TItem>&) {
// We only provide an operator delete to work around compiler warnings that can come
// up for an unmatched operator new when compiling with exceptions.
- SK_ABORT("Invalid Operation");
+ SK_CRASH();
}
#define GrNEW_APPEND_TO_RECORDER(recorder, type_name, args) \
diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index 546771e84c..6dd9edd64e 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -1094,13 +1094,13 @@ void SkOpAngle::debugValidateNext() const {
const SkOpAngle* next = first;
SkTDArray<const SkOpAngle*>(angles);
do {
-// SkASSERT_RELEASE(next->fSegment->debugContains(next));
+// SK_ALWAYSBREAK(next->fSegment->debugContains(next));
angles.push(next);
next = next->next();
if (next == first) {
break;
}
- SkASSERT_RELEASE(!angles.contains(next));
+ SK_ALWAYSBREAK(!angles.contains(next));
if (!next) {
return;
}
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index 10476ad434..2e03a44578 100644
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -2176,7 +2176,7 @@ int LogFontTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
break;
}
default:
- SK_ABORT("Invalid Text Encoding");
+ SK_CRASH();
}
if (sc) {
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
index bd6a5a2a2a..6a40e5080d 100644
--- a/src/ports/SkFontMgr_fontconfig.cpp
+++ b/src/ports/SkFontMgr_fontconfig.cpp
@@ -113,7 +113,7 @@ template <typename T, T* (*C)(), void (*D)(T*)> class SkAutoFc
public:
SkAutoFc() : SkAutoTCallVProc<T, FcTDestroy<T, D> >(C()) {
T* obj = this->operator T*();
- SkASSERT_RELEASE(nullptr != obj);
+ SK_ALWAYSBREAK(nullptr != obj);
}
explicit SkAutoFc(T* obj) : SkAutoTCallVProc<T, FcTDestroy<T, D> >(obj) {}
};
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp
index ef09210e38..585d809406 100644
--- a/src/ports/SkFontMgr_win_dw.cpp
+++ b/src/ports/SkFontMgr_win_dw.cpp
@@ -273,7 +273,7 @@ public:
if (!SUCCEEDED(fFactory->QueryInterface(&fFactory2))) {
// IUnknown::QueryInterface states that if it fails, punk will be set to nullptr.
// http://blogs.msdn.com/b/oldnewthing/archive/2004/03/26/96777.aspx
- SkASSERT_RELEASE(nullptr == fFactory2.get());
+ SK_ALWAYSBREAK(nullptr == fFactory2.get());
}
#endif
memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR));
diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp
index 008352ec4a..6ad01daca0 100644
--- a/src/ports/SkMemory_malloc.cpp
+++ b/src/ports/SkMemory_malloc.cpp
@@ -26,7 +26,8 @@ static inline void* throw_on_failure(size_t size, void* p) {
return p;
}
-void sk_abort_no_print() {
+void sk_throw() {
+ SkDEBUGFAIL("sk_throw");
abort();
}
diff --git a/src/ports/SkMemory_mozalloc.cpp b/src/ports/SkMemory_mozalloc.cpp
index f8a996307e..f070085893 100644
--- a/src/ports/SkMemory_mozalloc.cpp
+++ b/src/ports/SkMemory_mozalloc.cpp
@@ -12,8 +12,9 @@
#include "mozilla/mozalloc_abort.h"
#include "mozilla/mozalloc_oom.h"
-void sk_abort_no_print() {
- mozalloc_abort("Abort from sk_abort");
+void sk_throw() {
+ SkDEBUGFAIL("sk_throw");
+ mozalloc_abort("Abort from sk_throw");
}
void sk_out_of_memory(void) {
diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
index 160c66ed0e..38d09e85ec 100644
--- a/src/ports/SkTypeface_win_dw.cpp
+++ b/src/ports/SkTypeface_win_dw.cpp
@@ -111,7 +111,7 @@ int DWriteFontTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
break;
}
default:
- SK_ABORT("Invalid Text Encoding");
+ SK_CRASH();
}
for (int i = 0; i < glyphCount; ++i) {
diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h
index cdbeeaa785..3d6fce0a32 100644
--- a/src/ports/SkTypeface_win_dw.h
+++ b/src/ports/SkTypeface_win_dw.h
@@ -55,7 +55,7 @@ private:
if (!SUCCEEDED(fDWriteFontFace->QueryInterface(&fDWriteFontFace1))) {
// IUnknown::QueryInterface states that if it fails, punk will be set to nullptr.
// http://blogs.msdn.com/b/oldnewthing/archive/2004/03/26/96777.aspx
- SkASSERT_RELEASE(nullptr == fDWriteFontFace1.get());
+ SK_ALWAYSBREAK(nullptr == fDWriteFontFace1.get());
}
#endif
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 01:06:33 +0000