Source/core/dom/Document.cpp - Issue 1180793002: Document attribute charset and its aliases to return UTF-8

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: Source/core/dom/Document.cpp

Issue 1180793002: Document attribute charset and its aliases to return UTF-8 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add utf-8, utf8 and unicode-1-1-utf-8 as the return type Created 5 years, 6 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

« LayoutTests/dom/xhtml/level3/core/documentgetinputencoding02.js ('K') | « LayoutTests/fast/dom/document-attribute-js-null-expected.txt ('k') | Source/core/dom/Document.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/Document.cpp

diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp

index d305ffb3d2a566c0ec7c61d0db9b06639882d94a..8f9db56cc4018a549df0efaa59564a7e9c546995 100644

--- a/Source/core/dom/Document.cpp

+++ b/Source/core/dom/Document.cpp

@@ -4218,6 +4218,7 @@ void Document::setEncodingData(const DocumentEncodingData& newData)

m_titleElement->setTextContent(correctlyDecodedTitle);

}

+ ASSERT(newData.encoding().isValid());

m_encodingData = newData;

// FIXME: Should be removed as part of https://code.google.com/p/chromium/issues/detail?id=319643