| Index: third_party/WebKit/Source/core/html/parser/TextResourceDecoder.h
|
| diff --git a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.h b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.h
|
| index 36037f8fce9451bb1009da0c737ca27f0d4510eb..15cd6c6bce1ebe5a85ac2a499dbeb0117289353b 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.h
|
| +++ b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.h
|
| @@ -80,18 +80,16 @@
|
|
|
| private:
|
|
|
| - // TextResourceDecoder does four kinds of encoding detection:
|
| + // TextResourceDecoder does three kind of encoding detection:
|
| // 1. By BOM,
|
| // 2. By Content if |m_contentType| is not |PlainTextContext|
|
| - // (e.g. <meta> tag for HTML),
|
| - // 3. By isUTF8Encoded() to detect if the document
|
| - // is of UTF-8, and
|
| - // 4. By detectTextEncodingUniversal().
|
| + // (e.g. <meta> tag for HTML), and
|
| + // 3. By detectTextEncoding().
|
| enum EncodingDetectionOption {
|
| - // Use 1. + 2. + 4.
|
| + // Use 1. + 2. + 3.
|
| UseAllAutoDetection,
|
|
|
| - // Use 1. + 2. + 3.
|
| + // Use 1. + 2.
|
| UseContentAndBOMBasedDetection,
|
|
|
| // Use None of them.
|
| @@ -111,8 +109,7 @@
|
| bool checkForCSSCharset(const char*, size_t, bool& movedDataToBuffer);
|
| bool checkForXMLCharset(const char*, size_t, bool& movedDataToBuffer);
|
| void checkForMetaCharset(const char*, size_t);
|
| - void detectTextEncoding(const char*, size_t);
|
| - bool shouldDetectEncoding() const;
|
| + bool shouldAutoDetect() const;
|
|
|
| ContentType m_contentType;
|
| WTF::TextEncoding m_encoding;
|
|
|