corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#112793 fine tune frame charset mechanism

Browse Source 
Besides charset, document now records charset source as well.
nsCharsetSource was replaced by PRInt32.
Some code relocation in nsHTMLDocument.cpp
r=yokoyama sr=waterson
This commit is contained in:
shanjian@netscape.com
2001-12-26 03:17:59 +00:00
parent 41f70f6e57
commit a27effa4b8
35 changed files with 507 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docshell/base/nsWebShell.cpp
View File

@@ -551,7 +551,7 @@ nsWebShell::SetHistoryState(nsISupports* aLayoutHistoryState)
NS_IMETHODIMP
nsWebShell::LoadDocument(const char* aURL,
const char* aCharset,
nsCharsetSource aSource)
PRInt32 aSource)
{
// XXX hack. kee the aCharset and aSource wait to pick it up
nsCOMPtr<nsIContentViewer> cv;
@@ -561,12 +561,12 @@ nsWebShell::LoadDocument(const char* aURL,
nsCOMPtr<nsIMarkupDocumentViewer> muDV = do_QueryInterface(cv);
if (muDV)
{
nsCharsetSource hint;
muDV->GetHintCharacterSetSource((PRInt32 *)(&hint));
PRInt32 hint;
muDV->GetHintCharacterSetSource(&hint);
if( aSource > hint )
{
muDV->SetHintCharacterSet(NS_ConvertASCIItoUCS2(aCharset).get());
muDV->SetHintCharacterSetSource((PRInt32)aSource);
muDV->SetHintCharacterSetSource(aSource);
if(eCharsetReloadRequested != mCharsetReloadState)
{
mCharsetReloadState = eCharsetReloadRequested;
@@ -586,7 +586,7 @@ nsWebShell::LoadDocument(const char* aURL,
//Its name should be changed to "CharsetReloadDocument"
NS_IMETHODIMP
nsWebShell::ReloadDocument(const char* aCharset,
nsCharsetSource aSource)
PRInt32 aSource)
{
// XXX hack. kee the aCharset and aSource wait to pick it up
@@ -597,12 +597,12 @@ nsWebShell::ReloadDocument(const char* aCharset,
nsCOMPtr<nsIMarkupDocumentViewer> muDV = do_QueryInterface(cv);
if (muDV)
{
nsCharsetSource hint;
muDV->GetHintCharacterSetSource((PRInt32 *)(&hint));
PRInt32 hint;
muDV->GetHintCharacterSetSource(&hint);
if( aSource > hint )
{
muDV->SetHintCharacterSet(NS_ConvertASCIItoUCS2(aCharset).get());
muDV->SetHintCharacterSetSource((PRInt32)aSource);
muDV->SetHintCharacterSetSource(aSource);
if(eCharsetReloadRequested != mCharsetReloadState)
{
mCharsetReloadState = eCharsetReloadRequested;