1 files changed, 6 insertions, 8 deletions

diff --git a/chromium/third_party/WebKit/Source/core/loader/DocumentWriter.h b/chromium/third_party/WebKit/Source/core/loader/DocumentWriter.h
index f3da31f112b..4e79045a1e9 100644
--- a/chromium/third_party/WebKit/Source/core/loader/DocumentWriter.h
+++ b/chromium/third_party/WebKit/Source/core/loader/DocumentWriter.h
@@ -45,7 +45,7 @@ class TextResourceDecoder;
 class DocumentWriter : public RefCounted<DocumentWriter> {
     WTF_MAKE_NONCOPYABLE(DocumentWriter);
 public:
-    static PassRefPtr<DocumentWriter> create(Document*, const String& mimeType = "", const String& encoding = "", bool encodingUserChoosen = false);
+    static PassRefPtr<DocumentWriter> create(Document*, const AtomicString& mimeType = emptyAtom, const AtomicString& encoding = emptyAtom, bool encodingUserChoosen = false);
 
     ~DocumentWriter();
 
@@ -57,27 +57,25 @@ public:
 
     void addData(const char* bytes, size_t length);
 
-    const String& mimeType() const { return m_decoderBuilder.mimeType(); }
-    const String& encoding() const { return m_decoderBuilder.encoding(); }
+    const AtomicString& mimeType() const { return m_decoderBuilder.mimeType(); }
+    const AtomicString& encoding() const { return m_decoderBuilder.encoding(); }
     bool encodingWasChosenByUser() const { return m_decoderBuilder.encodingWasChosenByUser(); }
 
-    // Exposed for DocumentParser::appendBytes.
-    void reportDataReceived();
     // Exposed for DocumentLoader::replaceDocument.
     void appendReplacingData(const String&);
 
+    void setUserChosenEncoding(const String& charset);
+
     void setDocumentWasLoadedAsPartOfNavigation();
 
 private:
-    DocumentWriter(Document*, const String& mimeType, const String& encoding, bool encodingUserChoosen);
+    DocumentWriter(Document*, const AtomicString& mimeType, const AtomicString& encoding, bool encodingUserChoosen);
 
     PassRefPtr<Document> createDocument(const KURL&);
 
     Document* m_document;
-    bool m_hasReceivedSomeData;
     TextResourceDecoderBuilder m_decoderBuilder;
 
-    RefPtr<TextResourceDecoder> m_decoder;
     RefPtr<DocumentParser> m_parser;
 };