Move ownership of the TextResourceDecoder to DecodedDataDocumentParser

Source/core/loader/TextResourceDecoderBuilder.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 66 matching lines @@
     // Set the hint encoding to the parent frame encoding only if
     // the parent and the current frames share the security origin.
     // We impose this condition because somebody can make a child frameg63
     // containing a carefully crafted html/javascript in one encoding
     // that can be mistaken for hintEncoding (or related encoding) by
     // an auto detector. When interpreted in the latter, it could be
     // an attack vector.
     // FIXME: This might be too cautious for non-7bit-encodings and
     // we may consider relaxing this later after testing.
     if (frame && canReferToParentFrameEncoding(frame, parentFrame)) {
-        decoder->setHintEncoding(parentFrame->document()->decoder());
+        if (parentFrame->document()->encodingWasDetectedHeuristically())
+            decoder->setHintEncoding(parentFrame->document()->encoding());
+
         if (m_encoding.isEmpty())
             decoder->setEncoding(parentFrame->document()->inputEncoding(), TextResourceDecoder::EncodingFromParentFrame);
     }
 }
 
 PassRefPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* document)
 {
     RefPtr<TextResourceDecoder> decoder = createDecoderInstance(document);
     setupEncoding(decoder.get(), document);
-    document->setDecoder(decoder);
     return decoder.release();
 }
 
 void TextResourceDecoderBuilder::clear()
 {
     if (!m_encodingWasChosenByUser)
         m_encoding = String();
 }
 
 }