| Index: third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp b/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| index 78394e484806d4b0e997fd370ae5b5a4e6034eda..ef70ddb39a393d6b7e79143640e3cdf899b25e46 100644
|
| --- a/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| +++ b/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| @@ -160,11 +160,11 @@ static bool isUndesiredAlias(const char* alias) {
|
| }
|
|
|
| static void addToTextEncodingNameMap(const char* alias, const char* name) {
|
| - ASSERT(strlen(alias) <= maxEncodingNameLength);
|
| + DCHECK_LE(strlen(alias), maxEncodingNameLength);
|
| if (isUndesiredAlias(alias))
|
| return;
|
| const char* atomicName = textEncodingNameMap->get(name);
|
| - ASSERT(strcmp(alias, name) == 0 || atomicName);
|
| + DCHECK(strcmp(alias, name) == 0 || atomicName);
|
| if (!atomicName)
|
| atomicName = name;
|
| checkExistingName(alias, atomicName);
|
| @@ -175,7 +175,7 @@ static void addToTextCodecMap(const char* name,
|
| NewTextCodecFunction function,
|
| const void* additionalData) {
|
| const char* atomicName = textEncodingNameMap->get(name);
|
| - ASSERT(atomicName);
|
| + DCHECK(atomicName);
|
| textCodecMap->add(atomicName, TextCodecFactory(function, additionalData));
|
| }
|
|
|
| @@ -201,9 +201,9 @@ static void pruneBlacklistedCodecs() {
|
| }
|
|
|
| static void buildBaseTextCodecMaps() {
|
| - ASSERT(isMainThread());
|
| - ASSERT(!textCodecMap);
|
| - ASSERT(!textEncodingNameMap);
|
| + DCHECK(isMainThread());
|
| + DCHECK(!textCodecMap);
|
| + DCHECK(!textEncodingNameMap);
|
|
|
| textCodecMap = new TextCodecMap;
|
| textEncodingNameMap = new TextEncodingNameMap;
|
| @@ -242,9 +242,9 @@ static void extendTextCodecMaps() {
|
| std::unique_ptr<TextCodec> newTextCodec(const TextEncoding& encoding) {
|
| MutexLocker lock(encodingRegistryMutex());
|
|
|
| - ASSERT(textCodecMap);
|
| + DCHECK(textCodecMap);
|
| TextCodecFactory factory = textCodecMap->get(encoding.name());
|
| - ASSERT(factory.function);
|
| + DCHECK(factory.function);
|
| return factory.function(encoding, factory.additionalData);
|
| }
|
|
|
|
|