Source/web/WebPageSerializerImpl.cpp - Issue 22909053: Store the Document's encoding on the Document

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/web/WebPageSerializerImpl.cpp

Issue 22909053: Store the Document's encoding on the Document (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Set document encoding in DecodedDataDocumentParser instead of DocumentWriter Created 7 years, 4 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:

Index: Source/web/WebPageSerializerImpl.cpp

diff --git a/Source/web/WebPageSerializerImpl.cpp b/Source/web/WebPageSerializerImpl.cpp

index 41aa2ba99cc428deda7d6652ee54121379e3af40..8b6f325e46826b7e8cfb3a9cced533fee7d3c2df 100644

--- a/Source/web/WebPageSerializerImpl.cpp

+++ b/Source/web/WebPageSerializerImpl.cpp

@@ -169,7 +169,7 @@ String WebPageSerializerImpl::preActionBeforeSerializeOpenTag(

// Get encoding info.

String xmlEncoding = param->document->xmlEncoding();

if (xmlEncoding.isEmpty())

- xmlEncoding = param->document->encoding();

+ xmlEncoding = param->document->encodingName();

if (xmlEncoding.isEmpty())

xmlEncoding = UTF8Encoding().name();

result.append("<?xml version=\"");

@@ -509,8 +509,7 @@ bool WebPageSerializerImpl::serialize()

didSerialization = true;

- String encoding = document->encoding();

- const WTF::TextEncoding& textEncoding = encoding.isEmpty() ? UTF8Encoding() : WTF::TextEncoding(encoding);

+ const WTF::TextEncoding& textEncoding = document->encoding().isValid() ? document->encoding() : UTF8Encoding();

String directoryName = url == mainURL ? m_localDirectoryName : "";

SerializeDomParam param(url, textEncoding, document, directoryName);

« no previous file with comments | « Source/web/WebDocument.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »