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

Unified Diff: Source/core/dom/Document.h

Issue 22909053: Store the Document's encoding on the Document (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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: Source/core/dom/Document.h
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h
index f0145ded2326ec50528165feb74a7bf259f0d867..6d759820b3475a9dcb5359c44232f13c3b537c1b 100644
--- a/Source/core/dom/Document.h
+++ b/Source/core/dom/Document.h
@@ -351,11 +351,11 @@ public:
String defaultCharset() const;
- String inputEncoding() const { return Document::encoding(); }
- String charset() const { return Document::encoding(); }
- String characterSet() const { return Document::encoding(); }
+ String inputEncoding() const { return Document::encodingName(); }
+ String charset() const { return Document::encodingName(); }
+ String characterSet() const { return Document::encodingName(); }
- String encoding() const;
+ String encodingName() const;
void setCharset(const String&);
@@ -894,6 +894,9 @@ public:
void setDecoder(PassRefPtr<TextResourceDecoder>);
TextResourceDecoder* decoder() const { return m_decoder.get(); }
+ void setEncoding(const WTF::TextEncoding&);
+ const WTF::TextEncoding& encoding() const { return m_encoding; }
+
String displayStringModifiedByEncoding(const String&) const;
PassRefPtr<StringImpl> displayStringModifiedByEncoding(PassRefPtr<StringImpl>) const;
void displayBufferModifiedByEncoding(LChar* buffer, unsigned len) const
@@ -1282,6 +1285,7 @@ private:
String m_contentLanguage;
RefPtr<TextResourceDecoder> m_decoder;
+ WTF::TextEncoding m_encoding;
InheritedBool m_designMode;

Powered by Google App Engine
This is Rietveld 408576698