third_party/WebKit/Source/core/html/forms/EmailInputType.cpp - Issue 2097313002: Replace ASSERT macros with DCHECK, etc. in core/html/forms/.

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/core/html/forms/EmailInputType.cpp

Issue 2097313002: Replace ASSERT macros with DCHECK, etc. in core/html/forms/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/core/html/forms/DateTimeLocalInputType.cpp ('k') | third_party/WebKit/Source/core/html/forms/FileInputType.cpp » ('j') | third_party/WebKit/Source/core/html/forms/FormController.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/forms/EmailInputType.cpp

diff --git a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp

index ea55a6bc744d7f58409c6cff4dd9c0c27c8504fa..4f0c64e04e81934ce67a623e856bfa22651510df 100644

--- a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp

+++ b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp

@@ -75,7 +75,7 @@ String EmailInputType::convertEmailAddressToASCII(const ScriptRegexp& regexp, co

// Leak |idna| at the end.

UErrorCode errorCode = U_ZERO_ERROR;

static icu::IDNA *idna = icu::IDNA::createUTS46Instance(idnaConversionOption, errorCode);

- ASSERT(idna);

+ DCHECK(idna);

icu::IDNAInfo idnaInfo;

idna->nameToASCII(idnDomainName, domainName, idnaInfo, errorCode);

if (U_FAILURE(errorCode) || idnaInfo.hasErrors() || domainName.length() > maximumDomainNameLength)

@@ -211,7 +211,7 @@ bool EmailInputType::typeMismatch() const

String EmailInputType::typeMismatchText() const

{

String invalidAddress = findInvalidAddress(element().value());

- ASSERT(!invalidAddress.isNull());

+ DCHECK(!invalidAddress.isNull());

if (invalidAddress.isEmpty())

return locale().queryString(WebLocalizedString::ValidationTypeMismatchForEmailEmpty);

String atSign = String("@");

@@ -239,7 +239,7 @@ String EmailInputType::typeMismatchText() const

}

if (!checkValidDotUsage(domain)) {

size_t atIndexInUnicode = unicodeAddress.find('@');

- ASSERT(atIndexInUnicode != kNotFound);

+ DCHECK_NE(atIndexInUnicode, kNotFound);

return locale().queryString(WebLocalizedString::ValidationTypeMismatchForEmailInvalidDots, String("."), unicodeAddress.substring(atIndexInUnicode + 1));

}

if (element().multiple())