Rename NOTREACHED_NORETURN() to NOTREACHED()
This matches changes already made in chromium.
Bug: 40580068, 42271016
Change-Id: I77577f008782feee83978d3fcc6474f0cd570028
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/125850
Commit-Queue: Peter Boström <pbos@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index ac86ce2..b248066 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -425,7 +425,7 @@
break;
}
case CPDF_ContentMarkItem::kNone:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Write BDC (begin dictionary content) operator.
@@ -643,7 +643,7 @@
*buf << " W* ";
break;
case CFX_FillRenderOptions::FillType::kNoFill:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// Use a no-op path-painting operator to terminate the path without
diff --git a/core/fpdfapi/edit/cpdf_stringarchivestream.cpp b/core/fpdfapi/edit/cpdf_stringarchivestream.cpp
index 10ee993..3b07de3 100644
--- a/core/fpdfapi/edit/cpdf_stringarchivestream.cpp
+++ b/core/fpdfapi/edit/cpdf_stringarchivestream.cpp
@@ -14,7 +14,7 @@
CPDF_StringArchiveStream::~CPDF_StringArchiveStream() = default;
FX_FILESIZE CPDF_StringArchiveStream::CurrentOffset() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool CPDF_StringArchiveStream::WriteBlock(pdfium::span<const uint8_t> buffer) {
diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp
index 7413b28..ce4f848 100644
--- a/core/fpdfapi/font/cpdf_cmap.cpp
+++ b/core/fpdfapi/font/cpdf_cmap.cpp
@@ -358,7 +358,7 @@
}
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
int CPDF_CMap::GetCharSize(uint32_t charcode) const {
@@ -380,7 +380,7 @@
return 3;
return 4;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
size_t CPDF_CMap::CountChar(ByteStringView pString) const {
@@ -408,7 +408,7 @@
return count;
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CPDF_CMap::AppendChar(ByteString* str, uint32_t charcode) const {
@@ -456,7 +456,7 @@
*str += static_cast<char>(charcode);
return;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CPDF_CMap::SetAdditionalMappings(std::vector<CIDRange> mappings) {
diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index a2025ab..9a56d90 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -435,7 +435,7 @@
if (family == CPDF_ColorSpace::Family::kPattern) {
return pattern_;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
private:
@@ -582,7 +582,7 @@
case Family::kDeviceCMYK:
return 4;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1072,7 +1072,7 @@
return GetStockCS(Family::kDeviceRGB);
if (nComponents == 4)
return GetStockCS(Family::kDeviceCMYK);
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// static
diff --git a/core/fpdfapi/page/cpdf_devicecs.cpp b/core/fpdfapi/page/cpdf_devicecs.cpp
index 15d6210..97a980b 100644
--- a/core/fpdfapi/page/cpdf_devicecs.cpp
+++ b/core/fpdfapi/page/cpdf_devicecs.cpp
@@ -40,7 +40,7 @@
std::set<const CPDF_Object*>* pVisited) {
// Unlike other classes that inherit from CPDF_ColorSpace, CPDF_DeviceCS is
// never loaded by CPDF_ColorSpace.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::optional<FX_RGB_STRUCT<float>> CPDF_DeviceCS::GetRGB(
@@ -74,7 +74,7 @@
NormalizeChannel(cmyk.yellow), NormalizeChannel(cmyk.key));
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -140,6 +140,6 @@
break;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fpdfapi/page/cpdf_patterncs.cpp b/core/fpdfapi/page/cpdf_patterncs.cpp
index 1098538..605a3d4 100644
--- a/core/fpdfapi/page/cpdf_patterncs.cpp
+++ b/core/fpdfapi/page/cpdf_patterncs.cpp
@@ -46,7 +46,7 @@
std::optional<FX_RGB_STRUCT<float>> CPDF_PatternCS::GetRGB(
pdfium::span<const float> pBuf) const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
const CPDF_PatternCS* CPDF_PatternCS::AsPatternCS() const {
diff --git a/core/fpdfapi/page/cpdf_psengine_unittest.cpp b/core/fpdfapi/page/cpdf_psengine_unittest.cpp
index 31c0c7e..79da3c3 100644
--- a/core/fpdfapi/page/cpdf_psengine_unittest.cpp
+++ b/core/fpdfapi/page/cpdf_psengine_unittest.cpp
@@ -90,7 +90,7 @@
} else if (word == "invalid") {
EXPECT_FLOAT_EQ(0.0f, fv);
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/core/fpdfapi/page/cpdf_shadingpattern.cpp b/core/fpdfapi/page/cpdf_shadingpattern.cpp
index 4f7e3ba..af3d7f3 100644
--- a/core/fpdfapi/page/cpdf_shadingpattern.cpp
+++ b/core/fpdfapi/page/cpdf_shadingpattern.cpp
@@ -120,7 +120,7 @@
break;
}
default: {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -147,7 +147,7 @@
ValidateFunctions(nNumColorSpaceComponents, 1, 1);
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index d95562f..cea665e 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -491,7 +491,7 @@
if (param.m_Type == ContentParam::Type::kObject)
return param.m_pObject;
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
ByteString CPDF_StreamContentParser::GetString(uint32_t index) const {
diff --git a/core/fpdfapi/page/cpdf_transferfuncdib.cpp b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
index 40fafe8..de55f98 100644
--- a/core/fpdfapi/page/cpdf_transferfuncdib.cpp
+++ b/core/fpdfapi/page/cpdf_transferfuncdib.cpp
@@ -160,7 +160,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/355676038): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
diff --git a/core/fpdfapi/parser/cpdf_number_unittest.cpp b/core/fpdfapi/parser/cpdf_number_unittest.cpp
index 2a221a1..8e7c78d 100644
--- a/core/fpdfapi/parser/cpdf_number_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_number_unittest.cpp
@@ -24,7 +24,7 @@
str_ += ByteStringView(buffer);
return true;
}
- FX_FILESIZE CurrentOffset() const override { NOTREACHED_NORETURN(); }
+ FX_FILESIZE CurrentOffset() const override { NOTREACHED(); }
const ByteString& str() const { return str_; }
diff --git a/core/fpdfapi/parser/cpdf_object.cpp b/core/fpdfapi/parser/cpdf_object.cpp
index fae9223..db279b9 100644
--- a/core/fpdfapi/parser/cpdf_object.cpp
+++ b/core/fpdfapi/parser/cpdf_object.cpp
@@ -89,7 +89,7 @@
}
void CPDF_Object::SetString(const ByteString& str) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
CPDF_Array* CPDF_Object::AsMutableArray() {
diff --git a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
index f4a0ef2..097cee4 100644
--- a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
@@ -96,9 +96,7 @@
public:
using CPDF_ObjectAvail::CPDF_ObjectAvail;
~CPDF_ObjectAvailFailOnExclude() override = default;
- bool ExcludeObject(const CPDF_Object* object) const override {
- NOTREACHED_NORETURN();
- }
+ bool ExcludeObject(const CPDF_Object* object) const override { NOTREACHED(); }
};
class CPDF_ObjectAvailExcludeArray final : public CPDF_ObjectAvail {
diff --git a/core/fpdfapi/parser/cpdf_security_handler.cpp b/core/fpdfapi/parser/cpdf_security_handler.cpp
index b96ccd8..72675fc 100644
--- a/core/fpdfapi/parser/cpdf_security_handler.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler.cpp
@@ -545,7 +545,7 @@
case kUtf8toLatin1:
return WideString::FromUTF8(password).ToLatin1();
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fpdfapi/parser/cpdf_seekablemultistream.cpp b/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
index d2a11f2..d7a0c99 100644
--- a/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
+++ b/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
@@ -68,9 +68,9 @@
}
bool CPDF_SeekableMultiStream::Flush() {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool CPDF_SeekableMultiStream::WriteBlock(pdfium::span<const uint8_t> buffer) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/core/fpdfapi/render/cpdf_devicebuffer.cpp b/core/fpdfapi/render/cpdf_devicebuffer.cpp
index 719d30a..0957db6 100644
--- a/core/fpdfapi/render/cpdf_devicebuffer.cpp
+++ b/core/fpdfapi/render/cpdf_devicebuffer.cpp
@@ -98,7 +98,7 @@
m_Rect.Height());
return;
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -114,6 +114,6 @@
m_pDevice->StretchDIBits(std::move(buffer), m_Rect.left, m_Rect.top,
m_Rect.Width(), m_Rect.Height());
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index de4b2c1..53f79b5 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -356,7 +356,7 @@
buffer.GetMatrix());
buffer.OutputToDevice();
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
@@ -829,11 +829,11 @@
case TextRenderingMode::MODE_INVISIBLE:
// Already handled above, but the compiler is not smart enough to
// realize it.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case TextRenderingMode::MODE_CLIP:
return true;
case TextRenderingMode::MODE_UNKNOWN:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
FX_ARGB stroke_argb = 0;
@@ -1258,7 +1258,7 @@
return;
}
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
} else {
if (alpha != 1.0f) {
@@ -1311,7 +1311,7 @@
bitmap, mask_argb, left, top, blend_mode, nullptr,
false);
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
} else {
pClone->CompositeBitmap(0, 0, pClone->GetWidth(), pClone->GetHeight(),
@@ -1347,7 +1347,7 @@
std::move(bitmap), mask_argb, 0, 0, blend_mode,
nullptr, false);
#else
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
} else {
backdrop->CompositeBitmap(left - bbox.left, top - bbox.top, width, height,
diff --git a/core/fpdfdoc/cpdf_defaultappearance.cpp b/core/fpdfdoc/cpdf_defaultappearance.cpp
index cb8e6e5..201be89 100644
--- a/core/fpdfdoc/cpdf_defaultappearance.cpp
+++ b/core/fpdfdoc/cpdf_defaultappearance.cpp
@@ -132,7 +132,7 @@
static_cast<int>(g * 255 + 0.5f),
static_cast<int>(b * 255 + 0.5f)));
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
// static
diff --git a/core/fpdfdoc/cpvt_fontmap.cpp b/core/fpdfdoc/cpvt_fontmap.cpp
index d542158..f3c9c84 100644
--- a/core/fpdfdoc/cpvt_fontmap.cpp
+++ b/core/fpdfdoc/cpvt_fontmap.cpp
@@ -77,14 +77,14 @@
int32_t CPVT_FontMap::GetWordFontIndex(uint16_t word,
FX_Charset charset,
int32_t nFontIndex) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
int32_t CPVT_FontMap::CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
FX_Charset CPVT_FontMap::CharSetFromUnicode(uint16_t word,
FX_Charset nOldCharset) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index b3159c2..83f6ef4 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -1289,7 +1289,7 @@
m_TempTextBuf.AppendChar(0xfffe);
return true;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CPDF_TextPage::ProcessTextObjectItems(CPDF_TextObject* text_object,
diff --git a/core/fxcodec/flate/flatemodule.cpp b/core/fxcodec/flate/flatemodule.cpp
index 9cfdade..92f7c19 100644
--- a/core/fxcodec/flate/flatemodule.cpp
+++ b/core/fxcodec/flate/flatemodule.cpp
@@ -702,7 +702,7 @@
break;
}
case PredictorType::kNone: {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
@@ -741,7 +741,7 @@
break;
}
case PredictorType::kNone: {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/core/fxcodec/icc/icc_transform.cpp b/core/fxcodec/icc/icc_transform.cpp
index 552ad4a..4b36257 100644
--- a/core/fxcodec/icc/icc_transform.cpp
+++ b/core/fxcodec/icc/icc_transform.cpp
@@ -100,7 +100,7 @@
case cmsSigGrayData:
case cmsSigCmykData:
// Check3Components() already filtered these types.
- NOTREACHED_NORETURN();
+ NOTREACHED();
default:
break;
}
diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp
index 7befcea..55c46fc 100644
--- a/core/fxcodec/progressive_decoder.cpp
+++ b/core/fxcodec/progressive_decoder.cpp
@@ -114,7 +114,7 @@
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k8bppMask:
case FXDIB_Format::k8bppRgb:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case FXDIB_Format::kBgr:
*color_type = 2;
break;
@@ -126,7 +126,7 @@
case FXDIB_Format::kBgraPremul:
// TODO(crbug.com/355630556): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
*gamma = kPngGamma;
@@ -890,7 +890,7 @@
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k8bppMask:
case FXDIB_Format::k8bppRgb:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case FXDIB_Format::kBgr: {
switch (m_SrcFormat) {
case FXCodec_Invalid:
@@ -946,7 +946,7 @@
case FXDIB_Format::kBgraPremul:
// TODO(crbug.com/355630556): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
#endif
}
}
diff --git a/core/fxcodec/tiff/tiff_decoder.cpp b/core/fxcodec/tiff/tiff_decoder.cpp
index feb6c96..6f9ed19 100644
--- a/core/fxcodec/tiff/tiff_decoder.cpp
+++ b/core/fxcodec/tiff/tiff_decoder.cpp
@@ -129,7 +129,7 @@
}
tsize_t tiff_write(thandle_t context, tdata_t buf, tsize_t length) {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
toff_t tiff_seek(thandle_t context, toff_t offset, int whence) {
diff --git a/core/fxcrt/css/cfx_cssdeclaration.cpp b/core/fxcrt/css/cfx_cssdeclaration.cpp
index 76a7b61..8726c41 100644
--- a/core/fxcrt/css/cfx_cssdeclaration.cpp
+++ b/core/fxcrt/css/cfx_cssdeclaration.cpp
@@ -250,7 +250,7 @@
ParseValueListProperty(property, value, bImportant);
return;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fxcrt/notreached.h b/core/fxcrt/notreached.h
index 3cc68f7..7bb5a3a 100644
--- a/core/fxcrt/notreached.h
+++ b/core/fxcrt/notreached.h
@@ -9,10 +9,8 @@
#include "core/fxcrt/check.h"
-// NOTREACHED_NORETURN() annotates paths that are supposed to be unreachable.
-// They crash if they are ever hit.
-// TODO(crbug.com/pdfium/2008): Rename back to NOTREACHED() once there are no
-// callers of the old non-CHECK-fatal macro.
-#define NOTREACHED_NORETURN() CHECK(false)
+// NOTREACHED() annotates paths that are supposed to be unreachable. They crash
+// if they are ever hit.
+#define NOTREACHED() CHECK(false)
#endif // CORE_FXCRT_NOTREACHED_H_
diff --git a/core/fxcrt/xml/cfx_xmlparser.cpp b/core/fxcrt/xml/cfx_xmlparser.cpp
index 85357eb..9ae1a64 100644
--- a/core/fxcrt/xml/cfx_xmlparser.cpp
+++ b/core/fxcrt/xml/cfx_xmlparser.cpp
@@ -469,7 +469,7 @@
}
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CFX_XMLParser::ProcessTextChar(wchar_t character) {
diff --git a/core/fxge/agg/cfx_agg_devicedriver.cpp b/core/fxge/agg/cfx_agg_devicedriver.cpp
index 71662e3..9f82167 100644
--- a/core/fxge/agg/cfx_agg_devicedriver.cpp
+++ b/core/fxge/agg/cfx_agg_devicedriver.cpp
@@ -989,7 +989,7 @@
return flags;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fxge/cfx_color.cpp b/core/fxge/cfx_color.cpp
index 0c29178..03fcd71 100644
--- a/core/fxge/cfx_color.cpp
+++ b/core/fxge/cfx_color.cpp
@@ -87,7 +87,7 @@
case CFX_Color::Type::kTransparent:
break;
case CFX_Color::Type::kGray:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case CFX_Color::Type::kRGB:
ret = ConvertGRAY2RGB(fColor1);
break;
@@ -104,7 +104,7 @@
ret = ConvertRGB2GRAY(fColor1, fColor2, fColor3);
break;
case CFX_Color::Type::kRGB:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case CFX_Color::Type::kCMYK:
ret = ConvertRGB2CMYK(fColor1, fColor2, fColor3);
break;
@@ -121,7 +121,7 @@
ret = ConvertCMYK2RGB(fColor1, fColor2, fColor3, fColor4);
break;
case CFX_Color::Type::kCMYK:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
break;
}
diff --git a/core/fxge/cfx_face.cpp b/core/fxge/cfx_face.cpp
index f2e7dcf..f1bec32 100644
--- a/core/fxge/cfx_face.cpp
+++ b/core/fxge/cfx_face.cpp
@@ -282,7 +282,7 @@
case FT_ENCODING_WANSUNG:
return fxge::FontEncoding::kWansung;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/core/fxge/dib/blend.cpp b/core/fxge/dib/blend.cpp
index 949f925..bfd8f3b 100644
--- a/core/fxge/dib/blend.cpp
+++ b/core/fxge/dib/blend.cpp
@@ -98,7 +98,7 @@
return back_color + src_color - 2 * back_color * src_color / 255;
default:
// This function does not handle non-separable blend modes.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fxge/dib/cfx_dibbase.cpp b/core/fxge/dib/cfx_dibbase.cpp
index 7be8aa0..fed7a59 100644
--- a/core/fxge/dib/cfx_dibbase.cpp
+++ b/core/fxge/dib/cfx_dibbase.cpp
@@ -89,16 +89,16 @@
switch (src_bitmap->GetBPP()) {
case 8:
// TODO(crbug.com/42271020): Determine if this ever happens.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case 24:
ConvertBuffer_Rgb2ArgbPremul(dest_buf, dest_pitch, width, height,
src_bitmap, src_left, src_top);
break;
case 32:
// TODO(crbug.com/42271020): Determine if this ever happens.
- NOTREACHED_NORETURN();
+ NOTREACHED();
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
#endif // default(PDF_USE_SKIA)
@@ -449,7 +449,7 @@
src_left, src_top);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -496,7 +496,7 @@
pSrcBitmap, src_left, src_top);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -528,7 +528,7 @@
src_left, src_top);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -1092,7 +1092,7 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
case FXDIB_Format::k8bppMask: {
ConvertBuffer_8bppMask(dest_buf, dest_pitch, width, height, pSrcBitmap,
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index f289d1f..f888bb5 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -448,7 +448,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/42271020): Consider testing with
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index f6c663a..31d6d2a 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -225,7 +225,7 @@
switch (m_type) {
case StretchType::kNone:
// Already handled separately at the beginning of this method.
- NOTREACHED_NORETURN();
+ NOTREACHED();
case StretchType::kNormal:
return false;
case StretchType::kRotate:
diff --git a/core/fxge/dib/cfx_scanlinecompositor.cpp b/core/fxge/dib/cfx_scanlinecompositor.cpp
index 6e3b86e..6166e0f 100644
--- a/core/fxge/dib/cfx_scanlinecompositor.cpp
+++ b/core/fxge/dib/cfx_scanlinecompositor.cpp
@@ -2426,7 +2426,7 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN(); // Disallowed by Init().
+ NOTREACHED(); // Disallowed by Init().
}
case FXDIB_Format::k8bppRgb: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
@@ -2528,7 +2528,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/42271020): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
@@ -2549,7 +2549,7 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN(); // Disallowed by Init().
+ NOTREACHED(); // Disallowed by Init().
}
case FXDIB_Format::k8bppRgb: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
@@ -2603,7 +2603,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/42271020): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
@@ -2624,23 +2624,23 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN(); // Disallowed by Init().
+ NOTREACHED(); // Disallowed by Init().
}
case FXDIB_Format::k8bppRgb: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
// TODO(crbug.com/42271020): Consider adding support.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
case FXDIB_Format::k8bppMask: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
// TODO(crbug.com/42271020): Consider adding support.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
case FXDIB_Format::kBgr:
case FXDIB_Format::kBgrx:
case FXDIB_Format::kBgra: {
// TODO(crbug.com/42271020): Consider adding support.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
case FXDIB_Format::kBgraPremul: {
if (m_bRgbByteOrder) {
@@ -2685,7 +2685,7 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN(); // Disallowed by Init().
+ NOTREACHED(); // Disallowed by Init().
}
case FXDIB_Format::k8bppRgb: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
@@ -2728,7 +2728,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/42271020): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
@@ -2746,7 +2746,7 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN(); // Disallowed by Init().
+ NOTREACHED(); // Disallowed by Init().
}
case FXDIB_Format::k8bppRgb: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
@@ -2789,7 +2789,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/42271020): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
@@ -2806,7 +2806,7 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN(); // Disallowed by Init().
+ NOTREACHED(); // Disallowed by Init().
}
case FXDIB_Format::k8bppRgb: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
@@ -2850,7 +2850,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/42271020): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
@@ -2868,7 +2868,7 @@
case FXDIB_Format::kInvalid:
case FXDIB_Format::k1bppRgb:
case FXDIB_Format::k1bppMask: {
- NOTREACHED_NORETURN(); // Disallowed by Init().
+ NOTREACHED(); // Disallowed by Init().
}
case FXDIB_Format::k8bppRgb: {
CHECK(!m_bRgbByteOrder); // Disallowed by Init();
@@ -2913,7 +2913,7 @@
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/42271020): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
diff --git a/core/fxge/skia/cfx_dibbase_skia.cpp b/core/fxge/skia/cfx_dibbase_skia.cpp
index 52e79bd..18f2184 100644
--- a/core/fxge/skia/cfx_dibbase_skia.cpp
+++ b/core/fxge/skia/cfx_dibbase_skia.cpp
@@ -263,9 +263,9 @@
return CreateSkiaImageFromDib(this, kBGRA_8888_SkColorType,
kPremul_SkAlphaType);
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 01e731a..3472a47 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -1015,7 +1015,7 @@
FXRC_BLEND_MODE | FXRC_SOFT_CLIP | FXRC_ALPHA_OUTPUT |
FXRC_FILLSTROKE_PATH | FXRC_SHADING | FXRC_PREMULTIPLIED_ALPHA;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp
index 4d9449d..3afde48 100644
--- a/core/fxge/win32/cfx_psrenderer.cpp
+++ b/core/fxge/win32/cfx_psrenderer.cpp
@@ -579,7 +579,7 @@
case FXDIB_Format::kBgraPremul:
#endif
// Should have returned early due to IsAlphaFormat() check above.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
if (!bitmap) {
WriteString("\nQ\n");
diff --git a/core/fxge/win32/cgdi_device_driver.cpp b/core/fxge/win32/cgdi_device_driver.cpp
index 39cccf0..d79f149 100644
--- a/core/fxge/win32/cgdi_device_driver.cpp
+++ b/core/fxge/win32/cgdi_device_driver.cpp
@@ -386,7 +386,7 @@
case FXDC_RENDER_CAPS:
return m_RenderCaps;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -558,13 +558,13 @@
bool CGdiDeviceDriver::MultiplyAlpha(float alpha) {
// Not implemented. All callers are using `CFX_DIBitmap`-backed raster devices
// anyway.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool CGdiDeviceDriver::MultiplyAlphaMask(RetainPtr<const CFX_DIBitmap> mask) {
// Not implemented. All callers are using `CFX_DIBitmap`-backed raster devices
// anyway.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void CGdiDeviceDriver::DrawLine(float x1, float y1, float x2, float y2) {
diff --git a/core/fxge/win32/cps_printer_driver.cpp b/core/fxge/win32/cps_printer_driver.cpp
index 594e25f..45fda2b 100644
--- a/core/fxge/win32/cps_printer_driver.cpp
+++ b/core/fxge/win32/cps_printer_driver.cpp
@@ -40,7 +40,7 @@
return CFX_PSRenderer::RenderingLevel::kLevel3Type42;
default:
// |mode| should be PostScript.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -113,7 +113,7 @@
case FXDC_VERT_SIZE:
return m_VertSize;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -210,11 +210,11 @@
bool CPSPrinterDriver::MultiplyAlpha(float alpha) {
// PostScript doesn't support transparency. All callers are using
// `CFX_DIBitmap`-backed raster devices anyway.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool CPSPrinterDriver::MultiplyAlphaMask(RetainPtr<const CFX_DIBitmap> mask) {
// PostScript doesn't support transparency. All callers are using
// `CFX_DIBitmap`-backed raster devices anyway.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/core/fxge/win32/ctext_only_printer_driver.cpp b/core/fxge/win32/ctext_only_printer_driver.cpp
index d712898..d774e74 100644
--- a/core/fxge/win32/ctext_only_printer_driver.cpp
+++ b/core/fxge/win32/ctext_only_printer_driver.cpp
@@ -53,7 +53,7 @@
case FXDC_VERT_SIZE:
return m_VertSize;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -180,12 +180,12 @@
bool CTextOnlyPrinterDriver::MultiplyAlpha(float alpha) {
// Not needed. All callers are using `CFX_DIBitmap`-backed raster devices
// anyway.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
bool CTextOnlyPrinterDriver::MultiplyAlphaMask(
RetainPtr<const CFX_DIBitmap> mask) {
// Not needed. All callers are using `CFX_DIBitmap`-backed raster devices
// anyway.
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index bd2ed2d..9d6d56b 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -1044,7 +1044,7 @@
DoActionResetForm(action);
break;
case CPDF_Action::Type::kJavaScript:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case CPDF_Action::Type::kSetOCGState:
case CPDF_Action::Type::kThread:
case CPDF_Action::Type::kSound:
@@ -1126,7 +1126,7 @@
pFormField, &data->sValue, &data->bRC);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
});
}
@@ -1172,7 +1172,7 @@
context->OnPage_OutView();
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
});
}
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 3cb26d7..b432763 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -176,7 +176,7 @@
break;
case CPDF_AAction::kDocumentOpen:
case CPDF_AAction::kNumberOfActions:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return eEventType;
diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index 4da555f..0ee805d 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -250,13 +250,13 @@
break;
}
case FXDIB_Format::kInvalid: {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#if defined(PDF_USE_SKIA)
case FXDIB_Format::kBgraPremul: {
// TODO(crbug.com/355676038): Consider adding support for
// `FXDIB_Format::kBgraPremul`
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
#endif
}
diff --git a/fpdfsdk/pwl/cpwl_cblistbox.cpp b/fpdfsdk/pwl/cpwl_cblistbox.cpp
index ea1a330..f7e153b 100644
--- a/fpdfsdk/pwl/cpwl_cblistbox.cpp
+++ b/fpdfsdk/pwl/cpwl_cblistbox.cpp
@@ -74,7 +74,7 @@
m_pListCtrl->OnVK_RIGHT(IsSHIFTKeyDown(nFlag), IsCTRLKeyDown(nFlag));
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return OnNotifySelectionChanged(true, nFlag);
}
diff --git a/fxbarcode/cfx_barcode.cpp b/fxbarcode/cfx_barcode.cpp
index b97df4a..bf40685 100644
--- a/fxbarcode/cfx_barcode.cpp
+++ b/fxbarcode/cfx_barcode.cpp
@@ -50,7 +50,7 @@
case BC_TYPE::kUnknown:
return nullptr;
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} // namespace
diff --git a/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index 0eaafd0..e69acc4 100644
--- a/fxbarcode/datamatrix/BC_SymbolInfo.cpp
+++ b/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -100,7 +100,7 @@
case 36:
return 6;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -117,7 +117,7 @@
case 36:
return 6;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
index 9761b5d..a8cc5d9 100644
--- a/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
@@ -196,7 +196,7 @@
intermediate = (((temp % 3) + ((y + x) & 0x1)) & 0x1);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return intermediate == 0;
}
diff --git a/fxjs/xfa/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
index 3777edb..8ba9737 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -264,7 +264,7 @@
bSetting);
break;
case XFA_Event::NewText:
- NOTREACHED_NORETURN();
+ NOTREACHED();
case XFA_Event::PreviousContentType:
StringProperty(pIsolate, pValue, &pEventParam->m_wsPrevContentType,
bSetting);
diff --git a/testing/helpers/write.cc b/testing/helpers/write.cc
index 85e1dbe..08b9e40 100644
--- a/testing/helpers/write.cc
+++ b/testing/helpers/write.cc
@@ -122,7 +122,7 @@
if (subtype == FPDF_ANNOT_XFAWIDGET) {
return "XFAWidget";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
void AppendFlagString(const char* flag, std::string* output) {
@@ -180,7 +180,7 @@
if (type == FPDF_PAGEOBJ_FORM) {
return "Form";
}
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
std::vector<uint8_t> EncodePng(pdfium::span<const uint8_t> input,
@@ -207,7 +207,7 @@
/*discard_transparency=*/false);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return png;
}
diff --git a/testing/image_diff/image_diff_png.cpp b/testing/image_diff/image_diff_png.cpp
index bf9ea67..6e00aae 100644
--- a/testing/image_diff/image_diff_png.cpp
+++ b/testing/image_diff/image_diff_png.cpp
@@ -255,7 +255,7 @@
state->output_channels = 1;
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} else if (channels == 4) {
switch (state->output_format) {
@@ -272,10 +272,10 @@
state->output_channels = 4;
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
state->output->resize(state->width * state->output_channels * state->height);
diff --git a/xfa/fgas/crt/cfgas_stringformatter.cpp b/xfa/fgas/crt/cfgas_stringformatter.cpp
index 6e36773..38eae09 100644
--- a/xfa/fgas/crt/cfgas_stringformatter.cpp
+++ b/xfa/fgas/crt/cfgas_stringformatter.cpp
@@ -740,7 +740,7 @@
case CFGAS_StringFormatter::DateTimeType::kTime:
return CFGAS_StringFormatter::DateTimeType::kTimeDate;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -752,7 +752,7 @@
case CFGAS_StringFormatter::DateTimeType::kDate:
return CFGAS_StringFormatter::DateTimeType::kDateTime;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index 2a9248c..ed40d9a 100644
--- a/xfa/fwl/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -52,7 +52,7 @@
case 6:
return WideString::FromASCII("Sat");
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -83,7 +83,7 @@
case 11:
return WideString::FromASCII("December");
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp
index dd53416..792db31 100644
--- a/xfa/fxfa/cxfa_ffline.cpp
+++ b/xfa/fxfa/cxfa_ffline.cpp
@@ -48,7 +48,7 @@
case XFA_AttributeValue::Even:
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} else if (rect.width < 1.0f) {
switch (iHand) {
@@ -61,7 +61,7 @@
case XFA_AttributeValue::Even:
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
} else {
switch (iHand) {
@@ -74,7 +74,7 @@
case XFA_AttributeValue::Even:
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp
index 36daaea..ef9fa02 100644
--- a/xfa/fxfa/cxfa_textlayout.cpp
+++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -183,7 +183,7 @@
case XFA_AttributeValue::Radix:
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
m_pBreak->SetAlignment(iAlign);
@@ -715,7 +715,7 @@
break;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/xfa/fxfa/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp
index 77e6aba..9abfdca 100644
--- a/xfa/fxfa/cxfa_textparser.cpp
+++ b/xfa/fxfa/cxfa_textparser.cpp
@@ -135,7 +135,7 @@
case XFA_AttributeValue::Radix:
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
pStyle->SetTextAlign(hAlign);
CFX_CSSRect rtMarginWidth;
diff --git a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
index e09a417..e5ecd3c 100644
--- a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
@@ -87,7 +87,7 @@
break;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/xfa/fxfa/parser/cxfa_box.cpp b/xfa/fxfa/parser/cxfa_box.cpp
index b65e3c7..dfa5c94 100644
--- a/xfa/fxfa/parser/cxfa_box.cpp
+++ b/xfa/fxfa/parser/cxfa_box.cpp
@@ -206,7 +206,7 @@
} else if (type == XFA_Element::Rectangle || type == XFA_Element::Border) {
ToRectangle(this)->Draw(strokes, pGS, rtWidget, matrix);
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
@@ -236,7 +236,7 @@
} else if (type == XFA_Element::Rectangle || type == XFA_Element::Border) {
ToRectangle(this)->GetFillPath(strokes, rtWidget, &fillPath);
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
fillPath.Close();
fill->Draw(pGS, fillPath, rtWidget, matrix);
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 8be64a4..7141441 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -1647,7 +1647,7 @@
case XFA_Element::Variables:
return nullptr;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/xfa/fxfa/parser/cxfa_document_builder.cpp b/xfa/fxfa/parser/cxfa_document_builder.cpp
index cef571f..292322e 100644
--- a/xfa/fxfa/parser/cxfa_document_builder.cpp
+++ b/xfa/fxfa/parser/cxfa_document_builder.cpp
@@ -170,7 +170,7 @@
break;
}
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
}
diff --git a/xfa/fxfa/parser/cxfa_measurement.cpp b/xfa/fxfa/parser/cxfa_measurement.cpp
index 8eaca2c..9d66dc3 100644
--- a/xfa/fxfa/parser/cxfa_measurement.cpp
+++ b/xfa/fxfa/parser/cxfa_measurement.cpp
@@ -127,7 +127,7 @@
*fValue /= kPtToPc;
return true;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 8f6d82c..1b8547c 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -2918,7 +2918,7 @@
widget_type = XFA_FFWidgetType::kTextEdit;
}
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
if (!pUIChild) {
@@ -2933,7 +2933,7 @@
}
XFA_FFWidgetType CXFA_Node::GetDefaultFFWidgetType() const {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
CXFA_Node* CXFA_Node::CreateUINodeIfNeeded(CXFA_Ui* ui, XFA_Element type) {
@@ -2978,7 +2978,7 @@
} else if (type == XFA_Element::ExclGroup) {
ff_widget_type_ = XFA_FFWidgetType::kExclGroup;
} else {
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return ui_ ? ui_->GetFirstChild() : nullptr;
}
@@ -3706,7 +3706,7 @@
fStartOffset += (fHeight - fTextHeight + fSpaceAbove);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
if (fStartOffset < 0.1f)
@@ -5090,7 +5090,7 @@
ToXMLText(GetXMLMappingNode())->SetText(value);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
}
diff --git a/xfa/fxfa/parser/cxfa_rectangle.cpp b/xfa/fxfa/parser/cxfa_rectangle.cpp
index dd303a6..e190c51 100644
--- a/xfa/fxfa/parser/cxfa_rectangle.cpp
+++ b/xfa/fxfa/parser/cxfa_rectangle.cpp
@@ -300,7 +300,7 @@
StrokeEmbossed(pGS, rtWidget, fThickness, matrix);
break;
default:
- NOTREACHED_NORETURN();
+ NOTREACHED();
}
return;
}
