Tweaking WebPageSerializerImpl to emit a BOM for UTF16/32.

third_party/WebKit/Source/web/WebPageSerializerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 145 matching lines @@
             result.append(WebPageSerializer::generateMarkOfTheWebDeclaration(param->url));
         } else if (isHTMLBaseElement(*element)) {
             // Comment the BASE tag when serializing dom.
             result.appendLiteral("<!--");
         }
     } else {
         // Write XML declaration.
         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=\"");
             result.append(xmlEncoding);
             if (param->document->xmlStandalone())
                 result.appendLiteral("\" standalone=\"yes");
             result.appendLiteral("\"?>\n");
         }
         // Add doc type declaration if original document has it.
         if (!param->haveSeenDocType) {
@@ skipping 274 matching lines @@
     bool didSerialization = false;
     KURL mainURL = m_specifiedWebLocalFrameImpl->frame()->document()->url();
 
     WebLocalFrameImpl* webFrame = m_specifiedWebLocalFrameImpl;
     Document* document = webFrame->frame()->document();
     const KURL& url = document->url();
 
     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);
 
         Element* documentElement = document->documentElement();
         if (documentElement)
             buildContentForNode(documentElement, &param);
 
         encodeAndFlushBuffer(WebPageSerializerClient::CurrentFrameIsFinished, &param, ForceFlush);
     }
 
     ASSERT(m_dataBuffer.isEmpty());
     m_client->didSerializeDataForFrame(KURL(), WebCString("", 0), WebPageSerializerClient::AllFramesAreFinished);
     return didSerialization;
 }
 
 }  // namespace blink