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

Unified Diff: third_party/WebKit/Source/web/WebPageSerializerImpl.cpp

Issue 1407663004: Tweaking WebPageSerializerImpl to emit a BOM for UTF16/32. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverting unnecessary embedded_test_server.cc changes. Created 5 years, 2 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/web/WebPageSerializerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp b/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp
index 34bc016e83ca2780aa3ff3e6153ee8224a56a56b..fb0dd2ed9daf47877438037787533e571b217ddc 100644
--- a/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp
@@ -163,11 +163,7 @@ String WebPageSerializerImpl::preActionBeforeSerializeOpenTag(
if (!param->haveAddedXMLProcessingDirective) {
param->haveAddedXMLProcessingDirective = true;
// Get encoding info.
- String xmlEncoding = param->document->xmlEncoding();
- if (xmlEncoding.isEmpty())
- xmlEncoding = param->document->encodingName();
- if (xmlEncoding.isEmpty())
- xmlEncoding = UTF8Encoding().name();
+ String xmlEncoding = param->textEncoding.name();
result.appendLiteral("<?xml version=\"");
result.append(param->document->xmlVersion());
result.appendLiteral("\" encoding=\"");
@@ -462,7 +458,7 @@ bool WebPageSerializerImpl::serialize()
if (url.isValid() && m_localLinks.contains(url.string())) {
didSerialization = true;
- const WTF::TextEncoding& textEncoding = document->encoding().isValid() ? document->encoding() : UTF8Encoding();
+ const WTF::TextEncoding& textEncoding = UTF8Encoding();
String directoryName = url == mainURL ? m_localDirectoryName : "";
SerializeDomParam param(url, textEncoding, document, directoryName);

Powered by Google App Engine
This is Rietveld 408576698