Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

Issue 1721373002: UTF-8 detector for pages missing encoding info (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: left out test files that should be landed manually Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
index b9c76dd76e404045ad5b0494f5744decc2458f72..3e41a97154a7da153b035b1baef581fdf5febb0f 100644
--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
@@ -1544,8 +1544,11 @@ PassOwnPtr<TextResourceDecoder> XMLHttpRequest::createDecoder() const
if (m_responseTypeCode == ResponseTypeJSON)
return TextResourceDecoder::create("application/json", "UTF-8");
- if (!m_finalResponseCharset.isEmpty())
- return TextResourceDecoder::create("text/plain", m_finalResponseCharset);
+ if (!m_finalResponseCharset.isEmpty()) {
+ OwnPtr<TextResourceDecoder> decoder(TextResourceDecoder::create("text/plain"));
+ decoder->setEncoding(WTF::TextEncoding(m_finalResponseCharset), TextResourceDecoder::EncodingFromHTTPHeader);
+ return decoder.release();
+ }
// allow TextResourceDecoder to look inside the m_response if it's XML or HTML
if (responseIsXML()) {

Powered by Google App Engine
This is Rietveld 408576698