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

Source/core/dom/DocumentEncodingData.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY 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/html/HTMLImportResourceOwner.h"
+#include "core/dom/DocumentEncodingData.h"
+
+#include "core/html/parser/TextResourceDecoder.h"
 
 namespace WebCore {
 
-HTMLImportResourceOwner::HTMLImportResourceOwner()
+DocumentEncodingData::DocumentEncodingData()
+    : m_wasDetectedHeuristically(false)
+    , m_sawDecodingError(false)
 {
 }
 
-HTMLImportResourceOwner::~HTMLImportResourceOwner()
+DocumentEncodingData::DocumentEncodingData(const TextResourceDecoder& decoder)
 {
-    clearResource();
+    m_encoding = decoder.encoding();
+    m_wasDetectedHeuristically = decoder.encodingWasDetectedHeuristically();
+    m_sawDecodingError = decoder.sawError();
 }
 
-void HTMLImportResourceOwner::setResource(const ResourcePtr<RawResource>& resource)
+void DocumentEncodingData::setEncoding(const WTF::TextEncoding& encoding)
 {
-    ASSERT(!hasResource());
-    m_resource = resource;
-    m_resource->addClient(this);
-}
-
-void HTMLImportResourceOwner::clearResource()
-{
-    if (!hasResource())
-        return;
-    m_resource->removeClient(this);
-    m_resource = 0;
+    m_encoding = encoding;
 }
 
 } // namespace WebCore