commit ea801cee3b8669ec0ed2bb9512250a4dd1c4cedd
author Lei Zhang <thestig@chromium.org> Wed Jan 15 04:28:48 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jan 15 04:28:48 2020 +0000
tree b003c62939de0f445a3d8da448735417ba15a8c3
parent 41ce2a1e121f01e3b4eb05071da50eea80244154

Remove some repeated checks in CFX_DIBitmap().

Replace: ASSERT(cond); if (!cond) return;
with: if (!cond) { NOTREACHED(); return; }

Change-Id: I9b97c058c75174827c8f0b170db68b8ccbd8d5cc
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65050
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/dib/cfx_dibitmap.cpp

diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index 411b930..c5ee2c5 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -434,9 +434,10 @@
   if (!m_pBuffer)
     return false;
 
-  ASSERT(pSrcBitmap->IsAlphaMask());
-  if (!pSrcBitmap->IsAlphaMask())
+  if (!pSrcBitmap->IsAlphaMask()) {
+    NOTREACHED();
     return false;
+  }
 
   if (!IsAlphaMask() && !HasAlpha())
     return LoadChannelFromAlpha(FXDIB_Alpha, pSrcBitmap);
@@ -875,11 +876,11 @@
   if (!m_pBuffer)
     return false;
 
-  ASSERT(!pSrcBitmap->IsAlphaMask());
-  ASSERT(m_bpp >= 8);
   if (pSrcBitmap->IsAlphaMask() || m_bpp < 8) {
+    NOTREACHED();
     return false;
   }
+
   if (!GetOverlapRect(dest_left, dest_top, width, height,
                       pSrcBitmap->GetWidth(), pSrcBitmap->GetHeight(), src_left,
                       src_top, pClipRgn)) {
@@ -948,10 +949,10 @@
   if (!m_pBuffer)
     return false;
 
-  ASSERT(pMask->IsAlphaMask());
-  ASSERT(m_bpp >= 8);
-  if (!pMask->IsAlphaMask() || m_bpp < 8)
+  if (!pMask->IsAlphaMask() || m_bpp < 8) {
+    NOTREACHED();
     return false;
+  }
 
   if (!GetOverlapRect(dest_left, dest_top, width, height, pMask->GetWidth(),
                       pMask->GetHeight(), src_left, src_top, pClipRgn)) {
@@ -1096,9 +1097,15 @@
     }
     return true;
   }
-  ASSERT(m_bpp >= 24);
-  if (m_bpp < 24 || (!(alpha_flag >> 8) && IsCmykImage()))
+
+  if (m_bpp < 24) {
+    NOTREACHED();
     return false;
+  }
+
+  if (!(alpha_flag >> 8) && IsCmykImage())
+    return false;
+
   if (alpha_flag >> 8 && !IsCmykImage()) {
     std::tie(color_p[2], color_p[1], color_p[0]) =
         AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color),