From 7ebe97b8fd520dd6c38dc08f2daf5c2c74b28a99 Mon Sep 17 00:00:00 2001 From: "nhotta%netscape.com" Date: Fri, 28 May 1999 20:53:29 +0000 Subject: [PATCH] Added a check for force charset. git-svn-id: svn://10.0.0.236/trunk@33150 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsHTMLDocument.cpp | 7 +++++++ mozilla/layout/html/document/src/nsHTMLDocument.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 49ec060cb2b..1c08d3dd738 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -339,6 +339,13 @@ nsHTMLDocument::StartDocumentLoad(nsIURL *aURL, charset = requestCharset; } } + const PRUnichar* forceCharsetFromWebShell = NULL; + rv = webShell->GetForceCharacterSet(&forceCharsetFromWebShell); + if(NS_SUCCEEDED(rv) && (nsnull != forceCharsetFromWebShell)) { + charset = forceCharsetFromWebShell; + //TODO: we should define appropriate constant for force charset + charsetSource = kCharsetFromPreviousLoading; + } } NS_IF_RELEASE(webShell); #endif diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 49ec060cb2b..1c08d3dd738 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -339,6 +339,13 @@ nsHTMLDocument::StartDocumentLoad(nsIURL *aURL, charset = requestCharset; } } + const PRUnichar* forceCharsetFromWebShell = NULL; + rv = webShell->GetForceCharacterSet(&forceCharsetFromWebShell); + if(NS_SUCCEEDED(rv) && (nsnull != forceCharsetFromWebShell)) { + charset = forceCharsetFromWebShell; + //TODO: we should define appropriate constant for force charset + charsetSource = kCharsetFromPreviousLoading; + } } NS_IF_RELEASE(webShell); #endif