| Index: third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp b/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| index f90d447cebabc06f48162bf5f8de83b677797a5f..b3423597e2e6eee88bcadb6a3b195ea1a56c6b05 100644
|
| --- a/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| +++ b/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| @@ -289,10 +289,7 @@ void TextCodecICU::createICUConverter() const
|
|
|
| err = U_ZERO_ERROR;
|
| m_converterICU = ucnv_open(m_encoding.name(), &err);
|
| -#if !LOG_DISABLED
|
| - if (err == U_AMBIGUOUS_ALIAS_WARNING)
|
| - WTF_LOG_ERROR("ICU ambiguous alias warning for encoding: %s", m_encoding.name());
|
| -#endif
|
| + DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING) << "ICU ambiguous alias warning for encoding: " << m_encoding.name();
|
| if (m_converterICU)
|
| ucnv_setFallback(m_converterICU, TRUE);
|
| }
|
| @@ -347,7 +344,7 @@ String TextCodecICU::decode(const char* bytes, size_t length, FlushBehavior flus
|
| createICUConverter();
|
| ASSERT(m_converterICU);
|
| if (!m_converterICU) {
|
| - WTF_LOG_ERROR("error creating ICU encoder even though encoding was in table");
|
| + DLOG(ERROR) << "error creating ICU encoder even though encoding was in table";
|
| return String();
|
| }
|
| }
|
|
|