Revert of Revert "Moved text decoding to the parser thread"

Source/core/dom/DecodedDataDocumentParser.cpp

 /*
  * Copyright (C) 2010 Google, Inc. 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/DecodedDataDocumentParser.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/DocumentEncodingData.h"
-#include "core/fetch/TextResourceDecoder.h"
+#include "core/html/parser/TextResourceDecoder.h"
 
 namespace WebCore {
 
 DecodedDataDocumentParser::DecodedDataDocumentParser(Document* document)
     : DocumentParser(document)
-    , m_hasAppendedData(false)
+    , m_needsDecoder(true)
 {
 }
 
 DecodedDataDocumentParser::~DecodedDataDocumentParser()
 {
 }
 
 void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decoder)
 {
+    // If the decoder is explicitly unset rather than having ownership
+    // transferred away by takeDecoder(), we need to make sure it's recreated
+    // next time data is appended.
+    m_needsDecoder = !decoder;
     m_decoder = decoder;
 }
 
 TextResourceDecoder* DecodedDataDocumentParser::decoder()
 {
     return m_decoder.get();
 }
 
-void DecodedDataDocumentParser::setHasAppendedData()
+PassOwnPtr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder()
 {
-    m_hasAppendedData = true;
+    return m_decoder.release();
 }
 
 void DecodedDataDocumentParser::appendBytes(const char* data, size_t length)
 {
     if (!length)
         return;
 
     // This should be checking isStopped(), but XMLDocumentParser prematurely
     // stops parsing when handling an XSLT processing instruction and still
     // needs to receive decoded bytes.
@@ skipping 16 matching lines @@
     // We have nothing to do in that case.
     if (!m_decoder)
         return;
 
     String remainingData = m_decoder->flush();
     updateDocument(remainingData);
 }
 
 void DecodedDataDocumentParser::updateDocument(String& decodedData)
 {
-    DocumentEncodingData encodingData;
-    encodingData.encoding = m_decoder->encoding();
-    encodingData.wasDetectedHeuristically = m_decoder->encodingWasDetectedHeuristically();
-    encodingData.sawDecodingError = m_decoder->sawError();
-    document()->setEncodingData(encodingData);
+    document()->setEncodingData(DocumentEncodingData(*m_decoder.get()));
 
-    if (decodedData.isEmpty())
-        return;
-
-    append(decodedData.releaseImpl());
-    // FIXME: Should be removed as part of https://code.google.com/p/chromium/issues/detail?id=319643
-    if (!m_hasAppendedData) {
-        m_hasAppendedData = true;
-        if (m_decoder->encoding().usesVisualOrdering())
-            document()->setVisuallyOrdered();
-    }
+    if (!decodedData.isEmpty())
+        append(decodedData.releaseImpl());
 }
 
 };