Chromium Code Reviews| Index: third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp |
| diff --git a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp |
| index c12153f08f830617763e21efd8c32801cc914525..8ea26086ae652b8a9b9284335cf89957fd547053 100644 |
| --- a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp |
| +++ b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp |
| @@ -38,13 +38,17 @@ namespace blink { |
| bool detectTextEncoding(const char* data, |
| size_t length, |
| const char* hintEncodingName, |
| + const String& hintUrl, |
| + const char* hintUserLanguage, |
| WTF::TextEncoding* detectedEncoding) { |
| *detectedEncoding = WTF::TextEncoding(); |
| + Language language = UNKNOWN_LANGUAGE; |
|
Jinsuk Kim
2017/01/20 21:50:47
This is not necessary since LanguageFromCode handl
tkent
2017/01/23 00:02:57
Done.
|
| + LanguageFromCode(hintUserLanguage, &language); |
| int consumedBytes; |
| bool isReliable; |
| Encoding encoding = CompactEncDet::DetectEncoding( |
| - data, length, nullptr, nullptr, nullptr, |
| - EncodingNameAliasToEncoding(hintEncodingName), UNKNOWN_LANGUAGE, |
| + data, length, hintUrl.utf8().data(), nullptr, nullptr, |
| + EncodingNameAliasToEncoding(hintEncodingName), language, |
| CompactEncDet::WEB_CORPUS, |
| false, // Include 7-bit encodings to detect ISO-2022-JP |
| &consumedBytes, &isReliable); |