Move ownership of the TextResourceDecoder to DecodedDataDocumentParser

Source/core/loader/DocumentWriter.cpp

 /*
  * Copyright (C) 2010. Adam Barth. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 68 matching lines @@
     if (DocumentParser* parser = m_document->parser()) {
         parser->pinToMainThread();
         // Because we're pinned to the main thread we don't need to worry about
         // passing ownership of the source string.
         parser->append(source.impl());
     }
 }
 
 void DocumentWriter::reportDataReceived()
 {
-    ASSERT(m_decoder);
     if (m_hasReceivedSomeData)
         return;
     m_hasReceivedSomeData = true;
-    if (m_decoder->encoding().usesVisualOrdering())
+    RefPtr<TextResourceDecoder> decoder = m_parser->getDecoder();

[abarth-chromium, 2013/11/15 00:08:39]

getDecoder  ->  decoder

[oystein (OOO til 10th of July), 2013/11/15 00:17:24]

Done.

+    if (decoder && decoder->encoding().usesVisualOrdering())
         m_document->setVisuallyOrdered();
 }
 
 void DocumentWriter::addData(const char* bytes, size_t length)
 {
     ASSERT(m_parser);
-    if (!m_decoder && m_parser->needsDecoder() && 0 < length)
-        m_decoder = m_decoderBuilder.buildFor(m_document);
+    if (m_parser->needsDecoder() && 0 < length) {
+        RefPtr<TextResourceDecoder> decoder = m_decoderBuilder.buildFor(m_document);
+        m_parser->setDecoder(decoder);
+    }
     // appendBytes() can result replacing DocumentLoader::m_writer.
     RefPtr<DocumentWriter> protectingThis(this);
     size_t consumedChars = m_parser->appendBytes(bytes, length);
     if (consumedChars)
         reportDataReceived();
 }
 
 void DocumentWriter::end()
 {
     ASSERT(m_document);
 
     // http://bugs.webkit.org/show_bug.cgi?id=10854
     // The frame's last ref may be removed and it can be deleted by checkCompleted(),
     // so we'll add a protective refcount
     RefPtr<Frame> protector(m_document->frame());
 
     if (!m_parser)
         return;
 
-    if (!m_decoder && m_parser->needsDecoder())
-        m_decoder = m_decoderBuilder.buildFor(m_document);
+    if (m_parser->needsDecoder()) {
+        RefPtr<TextResourceDecoder> decoder = m_decoderBuilder.buildFor(m_document);
+        m_parser->setDecoder(decoder);
+    }
     // flush() can result replacing DocumentLoader::m_writer.
     RefPtr<DocumentWriter> protectingThis(this);
     size_t consumedChars = m_parser->flush();
     if (consumedChars)
         reportDataReceived();
     if (!m_parser)
         return;
 
     m_parser->finish();
     m_parser = 0;
     m_document = 0;
 }
 
+void DocumentWriter::setUserChosenEncoding(const String& charset)
+{
+    RefPtr<TextResourceDecoder> decoder = m_parser->getDecoder();
+    if (decoder)
+        decoder->setEncoding(charset, TextResourceDecoder::UserChosenEncoding);
+}
+
 void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation()
 {
     ASSERT(m_parser && !m_parser->isStopped());
     m_parser->setDocumentWasLoadedAsPartOfNavigation();
 }
 
 } // namespace WebCore