Merge "Pass more hints to encoding detector." to M57 branch

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 83 matching lines @@
     : m_mimeType(mimeType), m_encoding(encoding) {}
 
 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()) {
+      const WTF::TextEncoding hintEncoding =
+          encodingFromDomain.isValid() ? encodingFromDomain
+                                       : settings->getDefaultTextEncodingName();
       // Disable autodetection for XML to honor the default encoding (UTF-8) for
       // unlabelled documents.
-      return TextResourceDecoder::create(
-          m_mimeType,
-          encodingFromDomain.isValid() ? encodingFromDomain
-                                       : settings->getDefaultTextEncodingName(),
-          !DOMImplementation::isXMLMIMEType(m_mimeType));
+      if (DOMImplementation::isXMLMIMEType(m_mimeType))
+        return TextResourceDecoder::create(m_mimeType, hintEncoding);
+      return TextResourceDecoder::createWithAutoDetection(
+          m_mimeType, hintEncoding, document->url());
     }
   }
 
   return TextResourceDecoder::create(m_mimeType, encodingFromDomain);
 }
 
 inline void TextResourceDecoderBuilder::setupEncoding(
     TextResourceDecoder* decoder,
     Document* document) {
   LocalFrame* frame = document->frame();
@@ skipping 31 matching lines @@
       createDecoderInstance(document);
   setupEncoding(decoder.get(), document);
   return decoder;
 }
 
 void TextResourceDecoderBuilder::clear() {
   m_encoding = nullAtom;
 }
 
 }  // namespace blink