Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(440)

Unified Diff: third_party/WebKit/Source/core/html/parser/TextResourceDecoder.h

Issue 1888083002: Revert of UTF-8 detector for pages missing encoding info (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698