| Index: third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
|
| index 04ec94b583d03317cbc076c1ecfff4252f78d5ee..cb7988314de486ef892a235155d204483e438f03 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
|
| +++ b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
|
| @@ -31,8 +31,6 @@
|
| #include "wtf/text/TextCodec.h"
|
| #include "wtf/text/TextEncodingRegistry.h"
|
|
|
| -using namespace WTF;
|
| -
|
| namespace blink {
|
|
|
| using namespace HTMLNames;
|
| @@ -485,7 +483,7 @@ String TextResourceDecoder::decode(const char* data, size_t len) {
|
| m_codec = newTextCodec(m_encoding);
|
|
|
| String result = m_codec->decode(
|
| - dataForDecode, lengthForDecode, DoNotFlush,
|
| + dataForDecode, lengthForDecode, WTF::DoNotFlush,
|
| m_contentType == XMLContent && !m_useLenientXMLDecoding, m_sawError);
|
|
|
| m_buffer.clear();
|
| @@ -510,7 +508,7 @@ String TextResourceDecoder::flush() {
|
| m_codec = newTextCodec(m_encoding);
|
|
|
| String result = m_codec->decode(
|
| - m_buffer.data(), m_buffer.size(), FetchEOF,
|
| + m_buffer.data(), m_buffer.size(), WTF::FetchEOF,
|
| m_contentType == XMLContent && !m_useLenientXMLDecoding, m_sawError);
|
| m_buffer.clear();
|
| m_codec.reset();
|
|
|