From d1cfa23b9b4028b0ff2fed05ff2c9ff1d4f6dd08 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Tue, 18 Nov 2008 01:10:08 +0000 Subject: [PATCH] Make createDocument-created documents UTF-8. Bug 464958, r+sr=sicking, a=dveditz git-svn-id: svn://10.0.0.236/trunk@255083 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/test/test_bug431701.html | 2 +- mozilla/content/xml/document/src/nsXMLDocument.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mozilla/content/base/test/test_bug431701.html b/mozilla/content/base/test/test_bug431701.html index fc757b302e1..258ae211c64 100644 --- a/mozilla/content/base/test/test_bug431701.html +++ b/mozilla/content/base/test/test_bug431701.html @@ -71,7 +71,7 @@ var tests = [ [ frameDoc("five"), "UTF-8", "UTF-8", null ], [ frameDoc("six"), "UTF-8", "UTF-8", "UTF-8"], [ frameDoc("seven"), "ISO-8859-1", "ISO-8859-1", "ISO-8859-1" ], - [ createDoc, "ISO-8859-1", null, null ], + [ createDoc, "UTF-8", null, null ], [ xhrDoc(4), "UTF-8", "UTF-8", null ], [ xhrDoc(5), "UTF-8", "UTF-8", "UTF-8" ], [ xhrDoc(6), "ISO-8859-1", "ISO-8859-1", "ISO-8859-1" ], diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index e1a29c5391f..d894b192109 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -133,6 +133,10 @@ NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult, doc->SetPrincipal(aPrincipal); doc->SetBaseURI(aBaseURI); + // XMLDocuments and documents "created in memory" get to be UTF-8 by default, + // unlike the legacy HTML mess + doc->SetDocumentCharacterSet(NS_LITERAL_CSTRING("UTF-8")); + if (aDoctype) { nsCOMPtr tmpNode; rv = doc->AppendChild(aDoctype, getter_AddRefs(tmpNode));