commit 4d1379a8d47c8d441d4d3076fe712d0815cf1786
author Lei Zhang <thestig@chromium.org> Wed Jun 21 18:31:30 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 21 18:31:30 2023 +0000
tree 884308257741e5de60c22c722f52117a8f1d9ba4
parent c553157c221cad3b2a8fa49299fb31787a3aceba

Use NOTREACHED_NORETURN() in non-win32 core/fxge code

Switch from NOTREACHED() to NOTREACHED_NORETURN(). In some cases,
replace the NOTREACHED() with a CHECK().

Bug: pdfium:2008
Change-Id: I4de93909a44c3892520b9e6b6e4c0cd496bf5b39
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/108912
Reviewed-by: K. Moon <kmoon@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/agg/fx_agg_driver.cpp

diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index a2d6e03..5927643 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1028,8 +1028,7 @@
       return flags;
     }
     default:
-      NOTREACHED();
-      return 0;
+      NOTREACHED_NORETURN();
   }
 }
 

core/fxge/cfx_color.cpp

diff --git a/core/fxge/cfx_color.cpp b/core/fxge/cfx_color.cpp
index 23cdd0f..35e03a5 100644
--- a/core/fxge/cfx_color.cpp
+++ b/core/fxge/cfx_color.cpp
@@ -87,8 +87,7 @@
         case CFX_Color::Type::kTransparent:
           break;
         case CFX_Color::Type::kGray:
-          NOTREACHED();
-          break;
+          NOTREACHED_NORETURN();
         case CFX_Color::Type::kRGB:
           ret = ConvertGRAY2RGB(fColor1);
           break;
@@ -105,8 +104,7 @@
           ret = ConvertRGB2GRAY(fColor1, fColor2, fColor3);
           break;
         case CFX_Color::Type::kRGB:
-          NOTREACHED();
-          break;
+          NOTREACHED_NORETURN();
         case CFX_Color::Type::kCMYK:
           ret = ConvertRGB2CMYK(fColor1, fColor2, fColor3);
           break;
@@ -123,8 +121,7 @@
           ret = ConvertCMYK2RGB(fColor1, fColor2, fColor3, fColor4);
           break;
         case CFX_Color::Type::kCMYK:
-          NOTREACHED();
-          break;
+          NOTREACHED_NORETURN();
       }
       break;
   }

core/fxge/dib/cfx_dibbase.cpp

diff --git a/core/fxge/dib/cfx_dibbase.cpp b/core/fxge/dib/cfx_dibbase.cpp
index 4f99129..d83cdc8 100644
--- a/core/fxge/dib/cfx_dibbase.cpp
+++ b/core/fxge/dib/cfx_dibbase.cpp
@@ -1129,7 +1129,6 @@
                                 height, pSrcBitmap, src_left, src_top);
     }
     default:
-      NOTREACHED();
-      return false;
+      NOTREACHED_NORETURN();
   }
 }

core/fxge/dib/cfx_dibitmap.cpp

diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index 0d9360e..6df1eee 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -389,11 +389,9 @@
 }
 
 bool CFX_DIBitmap::MultiplyAlpha(const RetainPtr<CFX_DIBBase>& pSrcBitmap) {
-  if (!m_pBuffer)
-    return false;
+  CHECK(pSrcBitmap->IsMaskFormat());
 
-  if (!pSrcBitmap->IsMaskFormat()) {
-    NOTREACHED();
+  if (!m_pBuffer) {
     return false;
   }
 
@@ -698,11 +696,8 @@
                                    BlendMode blend_type,
                                    const CFX_ClipRgn* pClipRgn,
                                    bool bRgbByteOrder) {
-  if (pSrcBitmap->IsMaskFormat()) {
-    // Should have called CompositeMask().
-    NOTREACHED();
-    return false;
-  }
+  // Should have called CompositeMask().
+  CHECK(!pSrcBitmap->IsMaskFormat());
 
   if (!m_pBuffer)
     return false;
@@ -765,11 +760,8 @@
                                  BlendMode blend_type,
                                  const CFX_ClipRgn* pClipRgn,
                                  bool bRgbByteOrder) {
-  if (!pMask->IsMaskFormat()) {
-    // Should have called CompositeBitmap().
-    NOTREACHED();
-    return false;
-  }
+  // Should have called CompositeBitmap().
+  CHECK(pMask->IsMaskFormat());
 
   if (!m_pBuffer)
     return false;
@@ -926,11 +918,7 @@
     return true;
   }
 
-  if (GetBppFromFormat(m_Format) < 24) {
-    NOTREACHED();
-    return false;
-  }
-
+  CHECK_GE(GetBppFromFormat(m_Format), 24);
   color_p[3] = static_cast<uint8_t>(src_alpha);
   int Bpp = GetBppFromFormat(m_Format) / 8;
   const bool bAlpha = IsAlphaFormat();

core/fxge/dib/cfx_imagetransformer.cpp

diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index 8909ac3..12bc14d 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -214,19 +214,18 @@
     return true;
 
   switch (m_type) {
+    case StretchType::kNone:
+      // Already handled separately at the beginning of this method.
+      NOTREACHED_NORETURN();
     case StretchType::kNormal:
-      break;
+      return false;
     case StretchType::kRotate:
       ContinueRotate(pPause);
-      break;
+      return false;
     case StretchType::kOther:
       ContinueOther(pPause);
-      break;
-    default:
-      NOTREACHED();
-      break;
+      return false;
   }
-  return false;
 }
 
 void CFX_ImageTransformer::ContinueRotate(PauseIndicatorIface* pPause) {

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index fb37f9b..a287d45 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -951,10 +951,7 @@
 }
 
 bool CFX_SkiaDeviceDriver::MultiplyAlpha(const RetainPtr<CFX_DIBBase>& mask) {
-  if (!mask->IsMaskFormat()) {
-    NOTREACHED();
-    return false;
-  }
+  CHECK(mask->IsMaskFormat());
 
   sk_sp<SkImage> skia_mask = mask->RealizeSkImage();
   if (!skia_mask) {
@@ -990,8 +987,7 @@
              FXRC_BLEND_MODE | FXRC_SOFT_CLIP | FXRC_ALPHA_OUTPUT |
              FXRC_FILLSTROKE_PATH | FXRC_SHADING;
     default:
-      NOTREACHED();
-      return 0;
+      NOTREACHED_NORETURN();
   }
 }