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

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

Issue 69823002: Move ownership of the TextResourceDecoder to DecodedDataDocumentParser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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 00a32b950168fcb1b1c303f6991465c131af3ea2..828996e364d4a5a2337fa7464950a75f4379de92 100644
--- a/Source/core/dom/Document.h
+++ b/Source/core/dom/Document.h
@@ -152,7 +152,6 @@ class StyleSheetContents;
class StyleSheetList;
class Text;
class TextAutosizer;
-class TextResourceDecoder;
class Touch;
class TouchList;
class TransformSource;
@@ -841,11 +840,20 @@ public:
void finishedParsing();
- void setDecoder(PassRefPtr<TextResourceDecoder>);
- TextResourceDecoder* decoder() const { return m_decoder.get(); }
+ struct DocumentEncodingData {
+ DocumentEncodingData();
- void setEncoding(const WTF::TextEncoding&);
- const WTF::TextEncoding& encoding() const { return m_encoding; }
+ WTF::TextEncoding encoding;
+ bool wasDetectedHeuristically;
+ bool sawDecodingError;
+ };
+
+ void setEncodingData(const DocumentEncodingData& newData);
+ const DocumentEncodingData& encodingData() const { return m_encodingData; }
+ const WTF::TextEncoding& encoding() const { return m_encodingData.encoding; }
+
+ bool encodingWasDetectedHeuristically() const { return m_encodingData.wasDetectedHeuristically; }
+ bool sawDecodingError() const { return m_encodingData.sawDecodingError; }
void setAnnotatedRegionsDirty(bool f) { m_annotatedRegionsDirty = f; }
bool annotatedRegionsDirty() const { return m_annotatedRegionsDirty; }
@@ -1231,8 +1239,7 @@ private:
String m_contentLanguage;
- RefPtr<TextResourceDecoder> m_decoder;
- WTF::TextEncoding m_encoding;
+ DocumentEncodingData m_encodingData;
InheritedBool m_designMode;

Powered by Google App Engine
This is Rietveld 408576698