third_party/WebKit/Source/platform/text/LocaleICU.cpp - Issue 2811453002: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/text

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/text/LocaleICU.cpp

Issue 2811453002: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/text (Closed)

Patch Set: fix Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/text/DecodeEscapeSequences.h ('k') | third_party/WebKit/Source/platform/text/LocaleMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/text/LocaleICU.cpp

diff --git a/third_party/WebKit/Source/platform/text/LocaleICU.cpp b/third_party/WebKit/Source/platform/text/LocaleICU.cpp

index 4edf87992f92a5ae910e60e4a60bc13aa7172049..35fa661abfd879a45376aa8c5bed6088c440a482 100644

--- a/third_party/WebKit/Source/platform/text/LocaleICU.cpp

+++ b/third_party/WebKit/Source/platform/text/LocaleICU.cpp

@@ -73,7 +73,7 @@ std::unique_ptr<LocaleICU> LocaleICU::Create(const char* locale_string) {

String LocaleICU::DecimalSymbol(UNumberFormatSymbol symbol) {

UErrorCode status = U_ZERO_ERROR;

int32_t buffer_length = unum_getSymbol(number_format_, symbol, 0, 0, &status);

- ASSERT(U_SUCCESS(status) || status == U_BUFFER_OVERFLOW_ERROR);

+ DCHECK(U_SUCCESS(status) || status == U_BUFFER_OVERFLOW_ERROR);

if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR)

return String();

StringBuffer<UChar> buffer(buffer_length);

@@ -89,14 +89,14 @@ String LocaleICU::DecimalTextAttribute(UNumberFormatTextAttribute tag) {

UErrorCode status = U_ZERO_ERROR;

int32_t buffer_length =

unum_getTextAttribute(number_format_, tag, 0, 0, &status);

- ASSERT(U_SUCCESS(status) || status == U_BUFFER_OVERFLOW_ERROR);

+ DCHECK(U_SUCCESS(status) || status == U_BUFFER_OVERFLOW_ERROR);

if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR)

return String();

StringBuffer<UChar> buffer(buffer_length);

status = U_ZERO_ERROR;

unum_getTextAttribute(number_format_, tag, buffer.Characters(), buffer_length,

&status);

- ASSERT(U_SUCCESS(status));

+ DCHECK(U_SUCCESS(status));

if (U_FAILURE(status))

return String();

return String::Adopt(buffer);

@@ -124,7 +124,7 @@ void LocaleICU::InitializeLocaleData() {

symbols.push_back(DecimalSymbol(UNUM_NINE_DIGIT_SYMBOL));

symbols.push_back(DecimalSymbol(UNUM_DECIMAL_SEPARATOR_SYMBOL));

symbols.push_back(DecimalSymbol(UNUM_GROUPING_SEPARATOR_SYMBOL));

- ASSERT(symbols.size() == kDecimalSymbolsSize);

+ DCHECK_EQ(symbols.size(), kDecimalSymbolsSize);

SetLocaleData(symbols, DecimalTextAttribute(UNUM_POSITIVE_PREFIX),

DecimalTextAttribute(UNUM_POSITIVE_SUFFIX),

DecimalTextAttribute(UNUM_NEGATIVE_PREFIX),

@@ -160,7 +160,7 @@ UDateFormat* LocaleICU::OpenDateFormatForStandAloneMonthLabels(

udat_open(UDAT_PATTERN, UDAT_PATTERN, locale_.Data(), 0, -1,

kMonthPattern, is_short ? 3 : 4, &status);

udat_setContext(formatter, UDISPCTX_CAPITALIZATION_FOR_STANDALONE, &status);

- ASSERT(U_SUCCESS(status));

+ DCHECK(U_SUCCESS(status));

return formatter;

}