Disable autodetection for XML documents

third_party/WebKit/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 12 matching lines @@
  * 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 "core/loader/TextResourceDecoderBuilder.h"
 
+#include "core/dom/DOMImplementation.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include <memory>
 
 namespace blink {
 
 static inline bool canReferToParentFrameEncoding(const LocalFrame* frame, const LocalFrame* parentFrame)
 {
@@ skipping 83 matching lines @@
 
 TextResourceDecoderBuilder::~TextResourceDecoderBuilder()
 {
 }
 
 
 inline std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoderInstance(Document* document)
 {
     const WTF::TextEncoding encodingFromDomain = getEncodingFromDomain(document->url());
     if (LocalFrame* frame = document->frame()) {
-        if (Settings* settings = frame->settings())
-            return TextResourceDecoder::create(m_mimeType, encodingFromDomain.isValid() ? encodingFromDomain : settings->defaultTextEncodingName(), true);
+        if (Settings* settings = frame->settings()) {
+            // Disable autodetection for XML to honor the default encoding (UTF-8) for unlabelled documents.
+            return TextResourceDecoder::create(m_mimeType, encodingFromDomain.isValid() ? encodingFromDomain : settings->defaultTextEncodingName(), !DOMImplementation::isXMLMIMEType(m_mimeType));
+        }
     }
 
     return TextResourceDecoder::create(m_mimeType, encodingFromDomain);
 }
 
 inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decoder, Document* document)
 {
     LocalFrame* frame = document->frame();
     LocalFrame* parentFrame = 0;
     if (frame && frame->tree().parent() && frame->tree().parent()->isLocalFrame())
@@ skipping 26 matching lines @@
     setupEncoding(decoder.get(), document);
     return decoder;
 }
 
 void TextResourceDecoderBuilder::clear()
 {
     m_encoding = nullAtom;
 }
 
 } // namespace blink