WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/loader/TextResourceDecoder.cpp

 /*
     Copyright (C) 1999 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
     Copyright (C) 2005, 2006, 2007 Alexey Proskuryakov (ap@nypop.com)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
@@ skipping 313 matching lines @@
 }
 
 TextResourceDecoder::TextResourceDecoder(const String& mimeType, const TextEncoding& specifiedDefaultEncoding, bool usesEncodingDetector, const TextResourceDecoder* hintDecoder)
     : m_contentType(determineContentType(mimeType))
     , m_decoder(defaultEncoding(m_contentType, specifiedDefaultEncoding))
     , m_hintDecoder(hintDecoder)
     , m_source(DefaultEncoding)
     , m_checkedForBOM(false)
     , m_checkedForCSSCharset(false)
     , m_checkedForHeadCharset(false)
+    , m_useLenientXMLDecoding(false)
     , m_sawError(false)
     , m_usesEncodingDetector(usesEncodingDetector)
 {
 }
 
 TextResourceDecoder::~TextResourceDecoder()
 {
 }
 
 void TextResourceDecoder::setEncoding(const TextEncoding& encoding, EncodingSource source)
@@ skipping 523 matching lines @@
 
     if (m_buffer.isEmpty())
         return m_decoder.decode(data, len, false, m_contentType == XML, m_sawError);
 
     if (!movedDataToBuffer) {
         size_t oldSize = m_buffer.size();
         m_buffer.grow(oldSize + len);
         memcpy(m_buffer.data() + oldSize, data, len);
     }
 
-    String result = m_decoder.decode(m_buffer.data(), m_buffer.size(), false, m_contentType == XML, m_sawError);
+    String result = m_decoder.decode(m_buffer.data(), m_buffer.size(), false, m_contentType == XML && !m_useLenientXMLDecoding, m_sawError);
     m_buffer.clear();
     return result;
 }
 
 String TextResourceDecoder::flush()
 {
-    // For HTML and XML document, if we can not find proper encoding even
+    String result = m_decoder.decode(m_buffer.data(), m_buffer.size(), true, m_contentType == XML && !m_useLenientXMLDecoding, m_sawError);
     // document is completely loaded, we need to use automatically detect
     // the encoding of document if user has enabled this option.
     if (m_buffer.size() && !m_checkedForHeadCharset &&
         (m_contentType == HTML || m_contentType == XML) &&
         ((m_usesEncodingDetector && m_source == DefaultEncoding) ||
          (m_source == EncodingFromParentFrame && m_hintDecoder &&
           m_hintDecoder->source() == AutoDetectedEncoding)))
         detectEncoding(m_buffer.data(), m_buffer.size());
 
-    String result = m_decoder.decode(m_buffer.data(), m_buffer.size(), true, m_contentType == XML, m_sawError);
     m_buffer.clear();
     m_decoder.reset(m_decoder.encoding());
     return result;
 }
 
 }