Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for default encoding menu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29180 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ftang%netscape.com
1999-04-26 17:56:37 +00:00
parent f9b3f0d574
commit 3193eb1303
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -289,12 +289,22 @@ nsHTMLDocument::StartDocumentLoad(nsIURL *aURL,
if (NS_OK == rv) {
nsIHTMLContentSink* sink;
nsAutoString defaultHTMLCharset = "ISO-8859-1"; // fallback value in case webShell return error
nsCharsetSource charsetSource = kCharsetFromDocTypeDefault;
#ifdef rickgdebug
rv = NS_New_HTML_ContentSinkStream(&sink);
#else
NS_PRECONDITION(nsnull != aContainer, "No content viewer container");
aContainer->QueryInterface(kIWebShellIID, (void**)&webShell);
rv = NS_NewHTMLContentSink(&sink, this, aURL, webShell);
if (NS_OK == rv) {
const PRUnichar* defaultFromWebShell = NULL;
rv = webShell->GetDefaultCharacterSet(&defaultFromWebShell);
defaultHTMLCharset = defaultFromWebShell;
charsetSource = kCharsetFromUserDefault;
}
NS_IF_RELEASE(webShell);
#endif
@@ -313,6 +323,7 @@ nsHTMLDocument::StartDocumentLoad(nsIURL *aURL,
// nsIDTD* theDTD=0;
// NS_NewNavHTMLDTD(&theDTD);
// mParser->RegisterDTD(theDTD);
mParser->SetDocumentCharset( defaultHTMLCharset, charsetSource);
mParser->SetCommand(aCommand);
mParser->SetContentSink(sink);
mParser->Parse(aURL);