From b7bc4daca49c851d8ee9e224f863c9a988cea97d Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Wed, 7 Nov 2012 18:04:21 -0500 Subject: [PATCH] Bug 801402 - Use FindEncodingForLabel from XSLT. r=sicking --- content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp | 7 ++++--- content/xslt/src/xslt/txMozillaTextOutput.cpp | 7 +++---- content/xslt/src/xslt/txMozillaXMLOutput.cpp | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp b/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp index a9d6a3a122f..8b67fe12acf 100644 --- a/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp +++ b/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp @@ -5,7 +5,6 @@ #include "nsCOMArray.h" #include "nsIAuthPrompt.h" -#include "nsCharsetAlias.h" #include "nsIDOMNode.h" #include "nsIDOMDocument.h" #include "nsIDocument.h" @@ -39,10 +38,12 @@ #include "nsIURL.h" #include "nsCrossSiteListenerProxy.h" #include "nsError.h" -#include "mozilla/dom/Element.h" #include "mozilla/Attributes.h" +#include "mozilla/dom/Element.h" +#include "mozilla/dom/EncodingUtils.h" using namespace mozilla; +using mozilla::dom::EncodingUtils; static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID); @@ -258,7 +259,7 @@ txStylesheetSink::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) nsAutoCString charsetVal; nsAutoCString charset; if (NS_SUCCEEDED(channel->GetContentCharset(charsetVal))) { - if (NS_SUCCEEDED(nsCharsetAlias::GetPreferred(charsetVal, charset))) { + if (EncodingUtils::FindEncodingForLabel(charsetVal, charset)) { charsetSource = kCharsetFromChannel; } } diff --git a/content/xslt/src/xslt/txMozillaTextOutput.cpp b/content/xslt/src/xslt/txMozillaTextOutput.cpp index 33826174cbf..aadeb6d1af0 100644 --- a/content/xslt/src/xslt/txMozillaTextOutput.cpp +++ b/content/xslt/src/xslt/txMozillaTextOutput.cpp @@ -12,12 +12,12 @@ #include "nsIDocumentTransformer.h" #include "nsNetUtil.h" #include "nsCharsetSource.h" -#include "nsCharsetAlias.h" #include "nsIPrincipal.h" #include "txURIUtils.h" #include "nsContentCreatorFunctions.h" #include "nsContentUtils.h" #include "nsGkAtoms.h" +#include "mozilla/dom/EncodingUtils.h" using namespace mozilla::dom; @@ -149,11 +149,10 @@ txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument) // Set the charset if (!mOutputFormat.mEncoding.IsEmpty()) { - NS_LossyConvertUTF16toASCII charset(mOutputFormat.mEncoding); nsAutoCString canonicalCharset; - if (NS_SUCCEEDED(nsCharsetAlias::GetPreferred(charset, - canonicalCharset))) { + if (EncodingUtils::FindEncodingForLabel(mOutputFormat.mEncoding, + canonicalCharset)) { mDocument->SetDocumentCharacterSetSource(kCharsetFromOtherComponent); mDocument->SetDocumentCharacterSet(canonicalCharset); } diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp index aac233bbe69..c4bda4f44e3 100644 --- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp +++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp @@ -31,7 +31,7 @@ #include "nsIDocumentTransformer.h" #include "mozilla/css/Loader.h" #include "mozilla/dom/Element.h" -#include "nsCharsetAlias.h" +#include "mozilla/dom/EncodingUtils.h" #include "nsContentUtils.h" #include "txXMLUtils.h" #include "nsContentSink.h" @@ -826,9 +826,9 @@ txMozillaXMLOutput::createResultDocument(const nsSubstring& aName, int32_t aNsID // Set the charset if (!mOutputFormat.mEncoding.IsEmpty()) { - NS_LossyConvertUTF16toASCII charset(mOutputFormat.mEncoding); nsAutoCString canonicalCharset; - if (NS_SUCCEEDED(nsCharsetAlias::GetPreferred(charset, canonicalCharset))) { + if (EncodingUtils::FindEncodingForLabel(mOutputFormat.mEncoding, + canonicalCharset)) { mDocument->SetDocumentCharacterSetSource(kCharsetFromOtherComponent); mDocument->SetDocumentCharacterSet(canonicalCharset); }