Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 19:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 20315: Make non-iso charsets work in frameset documents. Fix 1/2: Propagate charset info through webshell reloads r=ftang a=chofmann

Browse Source
This commit is contained in:
pollmann%netscape.com 1999-12-13 22:41:09 +00:00
parent ab1040199d
commit 3657f5ebf1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docshell/base/nsWebShell.cpp
View File

@ -836,7 +836,7 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer,
("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p", ("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p",
this, aContentViewer, aCommand ? aCommand : "", aExtraInfo)); this, aContentViewer, aCommand ? aCommand : "", aExtraInfo));
if (mContentViewer && (eCharsetReloadInit!=mCharsetReloadState)) if (mContentViewer) // && (eCharsetReloadInit!=mCharsetReloadState))
{ // get any interesting state from the old content viewer { // get any interesting state from the old content viewer
// XXX: it would be far better to just reuse the document viewer , // XXX: it would be far better to just reuse the document viewer ,
// since we know we're just displaying the same document as before // since we know we're just displaying the same document as before

2
webshell/src/nsWebShell.cpp
View File

@ -836,7 +836,7 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer,
("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p", ("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p",
this, aContentViewer, aCommand ? aCommand : "", aExtraInfo)); this, aContentViewer, aCommand ? aCommand : "", aExtraInfo));
if (mContentViewer && (eCharsetReloadInit!=mCharsetReloadState)) if (mContentViewer) // && (eCharsetReloadInit!=mCharsetReloadState))
{ // get any interesting state from the old content viewer { // get any interesting state from the old content viewer
// XXX: it would be far better to just reuse the document viewer , // XXX: it would be far better to just reuse the document viewer ,
// since we know we're just displaying the same document as before // since we know we're just displaying the same document as before