| 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 370828c4470b8491c32355a50357947c09986174..8fd30394737e89443cb5b74015a21468b7009a40 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
|
| +++ b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
|
| @@ -417,7 +417,7 @@ void TextResourceDecoder::detectTextEncoding(const char* data, size_t len)
|
| if (!shouldDetectEncoding())
|
| return;
|
|
|
| - if (m_encodingDetectionOption == UseAllAutoDetection) {
|
| + if (true || m_encodingDetectionOption == UseAllAutoDetection) {
|
| WTF::TextEncoding detectedEncoding;
|
| if (detectTextEncodingUniversal(data, len, m_hintEncoding, &detectedEncoding)) {
|
| setEncoding(detectedEncoding, EncodingFromContentSniffing);
|
| @@ -435,7 +435,7 @@ bool TextResourceDecoder::shouldDetectEncoding() const
|
| {
|
| // Just checking m_hintEncoding suffices here because it's only set
|
| // in setHintEncoding when the source is AutoDetectedEncoding.
|
| - return m_source == DefaultEncoding || (m_source == EncodingFromParentFrame && m_hintEncoding);
|
| + return true; // m_source == DefaultEncoding || (m_source == EncodingFromParentFrame && m_hintEncoding);
|
| }
|
|
|
| String TextResourceDecoder::flush()
|
|
|