Remove SkASSERT() usage in PDFium. Use ASSERT() and NOTREACHED(), like most of PDFium. Flip some comparisons, update a TODO, and remove one unnecessary assert along the way. Change-Id: I0ad772cac9eab96da63362e8ab9dffa4b9b6a455 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/58291 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp index 133ebff..2b79abe 100644 --- a/core/fxge/cfx_renderdevice.cpp +++ b/core/fxge/cfx_renderdevice.cpp
@@ -840,7 +840,7 @@ #ifdef _SKIA_SUPPORT_ void CFX_RenderDevice::DebugVerifyBitmapIsPreMultiplied() const { - SkASSERT(0); + NOTREACHED(); } bool CFX_RenderDevice::SetBitsWithMask(const RetainPtr<CFX_DIBBase>& pBitmap,
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 4169766..b7e205a 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp
@@ -272,13 +272,13 @@ static void DebugValidate(const RetainPtr<CFX_DIBitmap>& bitmap, const RetainPtr<CFX_DIBitmap>& device) { if (bitmap) { - SkASSERT(bitmap->GetBPP() == 8 || bitmap->GetBPP() == 32); + ASSERT(bitmap->GetBPP() == 8 || bitmap->GetBPP() == 32); if (bitmap->GetBPP() == 32) { bitmap->DebugVerifyBitmapIsPreMultiplied(nullptr); } } if (device) { - SkASSERT(device->GetBPP() == 8 || device->GetBPP() == 32); + ASSERT(device->GetBPP() == 8 || device->GetBPP() == 32); if (device->GetBPP() == 32) { device->DebugVerifyBitmapIsPreMultiplied(nullptr); } @@ -416,7 +416,7 @@ } uint8_t FloatToByte(float f) { - ASSERT(0 <= f); + ASSERT(f >= 0); ASSERT(f <= 1); return (uint8_t)(f * 255.99f); } @@ -699,7 +699,7 @@ pSource->DebugVerifyBitmapIsPreMultiplied(buffer); break; default: - SkASSERT(0); // TODO(caryclark) ensure that all cases are covered + NOTREACHED(); // TODO(bug_11) ensure that all cases are covered colorType = SkColorType::kUnknown_SkColorType; } SkImageInfo imageInfo = @@ -1031,7 +1031,7 @@ while (m_clipIndex > m_commandIndex) { do { --m_clipIndex; - SkASSERT(m_clipIndex >= 0); + ASSERT(m_clipIndex >= 0); } while (m_commands[m_clipIndex] != Clip::kSave); m_pDriver->SkiaCanvas()->restore(); } @@ -1113,7 +1113,7 @@ return false; Dump(__func__); while (Clip::kSave != m_commands[--m_commandIndex]) { - SkASSERT(m_commandIndex > 0); + ASSERT(m_commandIndex > 0); } return true; } @@ -1179,7 +1179,7 @@ while (m_clipIndex > limit) { do { --m_clipIndex; - SkASSERT(m_clipIndex >= 0); + ASSERT(m_clipIndex >= 0); } while (m_commands[m_clipIndex] != Clip::kSave); m_pDriver->SkiaCanvas()->restore(); } @@ -1187,7 +1187,7 @@ if (Clip::kSave == m_commands[m_clipIndex]) { m_pDriver->SkiaCanvas()->save(); } else { - SkASSERT(Clip::kPath == m_commands[m_clipIndex]); + ASSERT(Clip::kPath == m_commands[m_clipIndex]); m_pDriver->SkiaCanvas()->clipPath(m_clips[m_clipIndex], SkClipOp::kIntersect, true); } @@ -1277,10 +1277,10 @@ DumpEndPrefix(); int skCanvasSaveCount = m_pDriver->SkiaCanvas()->getSaveCount(); int cacheSaveCount = 1; - SkASSERT(m_clipIndex <= m_commands.count()); + ASSERT(m_clipIndex <= m_commands.count()); for (int index = 0; index < m_clipIndex; ++index) cacheSaveCount += Clip::kSave == m_commands[index]; - SkASSERT(skCanvasSaveCount == cacheSaveCount); + ASSERT(skCanvasSaveCount == cacheSaveCount); #endif // SHOW_SKIA_PATH } @@ -1337,7 +1337,7 @@ return; int aggSaveCount = AggSaveCount(m_pDriver); int cacheSaveCount = CacheSaveCount(m_commands, m_commandIndex); - SkASSERT(m_clipIndex <= m_commands.count()); + ASSERT(m_clipIndex <= m_commands.count()); if (aggSaveCount != cacheSaveCount) { // may not signify a bug if counts don't match printf("aggSaveCount %d != cacheSaveCount %d\n", aggSaveCount, @@ -1369,7 +1369,7 @@ } if (!foundMatch) { DumpClipStacks(); - SkASSERT(0); + NOTREACHED(); } } #endif // SHOW_SKIA_PATH @@ -1539,7 +1539,7 @@ #endif // _SKIA_SUPPORT_PATHS_ m_bGroupKnockout(bGroupKnockout) { SkBitmap skBitmap; - SkASSERT(pBitmap->GetBPP() == 8 || pBitmap->GetBPP() == 32); + ASSERT(pBitmap->GetBPP() == 8 || pBitmap->GetBPP() == 32); SkImageInfo imageInfo = SkImageInfo::Make( pBitmap->GetWidth(), pBitmap->GetHeight(), pBitmap->GetBPP() == 8 ? kAlpha_8_SkColorType : kN32_SkColorType, @@ -2244,9 +2244,8 @@ srcWidth, srcHeight, SkColorType::kN32_SkColorType, kPremul_SkAlphaType); SkBitmap skSrcBitmap; skSrcBitmap.installPixels(srcImageInfo, srcBuffer, srcRowBytes); - SkASSERT(pBitmap); uint8_t* dstBuffer = pBitmap->GetBuffer(); - SkASSERT(dstBuffer); + ASSERT(dstBuffer); int dstWidth = pBitmap->GetWidth(); int dstHeight = pBitmap->GetHeight(); int dstRowBytes = dstWidth * sizeof(uint32_t); @@ -2672,7 +2671,7 @@ void CFX_DIBBase::DebugVerifyBitmapIsPreMultiplied(void* opt) const { #ifdef SK_DEBUG - SkASSERT(32 == GetBPP()); + ASSERT(GetBPP() == 32); const uint32_t* buffer = (const uint32_t*)(opt ? opt : GetBuffer()); int width = GetWidth(); int height = GetHeight(); @@ -2685,9 +2684,9 @@ uint8_t g = SkGetPackedG32(srcRow[x]); uint8_t b = SkGetPackedB32(srcRow[x]); SkA32Assert(a); - SkASSERT(r <= a); - SkASSERT(g <= a); - SkASSERT(b <= a); + ASSERT(r <= a); + ASSERT(g <= a); + ASSERT(b <= a); } } #endif // SK_DEBUG