From 89f8ed5563cc65cca8387e50f854857d002df369 Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Mon, 13 Dec 1999 22:41:09 +0000 Subject: [PATCH] Bug 20315: Make non-iso charsets work in frameset documents. Fix 1/2: Propagate charset info through webshell reloads r=ftang a=chofmann git-svn-id: svn://10.0.0.236/trunk@55935 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 2 +- mozilla/webshell/src/nsWebShell.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 89218343754..f70c9949b01 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -836,7 +836,7 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer, ("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p", this, aContentViewer, aCommand ? aCommand : "", aExtraInfo)); - if (mContentViewer && (eCharsetReloadInit!=mCharsetReloadState)) + if (mContentViewer) // && (eCharsetReloadInit!=mCharsetReloadState)) { // get any interesting state from the old content 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 diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 89218343754..f70c9949b01 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -836,7 +836,7 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer, ("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p", this, aContentViewer, aCommand ? aCommand : "", aExtraInfo)); - if (mContentViewer && (eCharsetReloadInit!=mCharsetReloadState)) + if (mContentViewer) // && (eCharsetReloadInit!=mCharsetReloadState)) { // get any interesting state from the old content 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