third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp - Issue 1890103002: Reland "UTF-8 detector for pages missing encoding info"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1890103002: Reland "UTF-8 detector for pages missing encoding info" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « third_party/WebKit/Source/core/html/parser/TextResourceDecoderTest.cpp ('k') | third_party/WebKit/Source/platform/text/TextEncodingDetector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f6b623e4a66c7c405b6359dd3e69193dace570c4..fa8a7dc5586973989d4d705e4462c5e711909bf4 100644

--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

@@ -1539,8 +1539,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()) {