From b0f03c19e3f0f8ea3e9adc1ead3f8bfd5a4d57e2 Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Tue, 18 Jan 2000 20:31:15 +0000 Subject: [PATCH] Bug 20315/24243/23571: Backing change for 20315 out - it was causing javascript handlers to not fire and scripts to not execute. Working with joki to understand this r=self, backing out change only git-svn-id: svn://10.0.0.236/trunk@58112 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 6 ++++-- mozilla/webshell/src/nsWebShell.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 6e9b9d569d2..96f13df2e24 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -808,10 +808,10 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer, ("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p", this, aContentViewer, aCommand ? aCommand : "", aExtraInfo)); +/* nsCOMPtr oldMUDV; // // The following logic is mirrored in nsHTMLDocument::StartDocumentLoad! // - nsCOMPtr oldMUDV; 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 , @@ -834,8 +834,10 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer, } } } +*/ + if (mContentViewer) { - if (oldMUDV) { + nsCOMPtr oldMUDV = do_QueryInterface(mContentViewer); PRUnichar *defaultCharset=nsnull; PRUnichar *forceCharset=nsnull; PRUnichar *hintCharset=nsnull; diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 6e9b9d569d2..96f13df2e24 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -808,10 +808,10 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer, ("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p", this, aContentViewer, aCommand ? aCommand : "", aExtraInfo)); +/* nsCOMPtr oldMUDV; // // The following logic is mirrored in nsHTMLDocument::StartDocumentLoad! // - nsCOMPtr oldMUDV; 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 , @@ -834,8 +834,10 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer, } } } +*/ + if (mContentViewer) { - if (oldMUDV) { + nsCOMPtr oldMUDV = do_QueryInterface(mContentViewer); PRUnichar *defaultCharset=nsnull; PRUnichar *forceCharset=nsnull; PRUnichar *hintCharset=nsnull;