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