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

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@58112 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pollmann%netscape.com
2000-01-18 20:31:15 +00:00
parent 03c87d94d3
commit b0f03c19e3
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -808,10 +808,10 @@ nsWebShell::Embed(nsIContentViewer* aContentViewer,
("nsWebShell::Embed: this=%p aDocViewer=%p aCommand=%s aExtraInfo=%p",
this, aContentViewer, aCommand ? aCommand : "", aExtraInfo));
/* nsCOMPtr<nsIMarkupDocumentViewer> oldMUDV;
//
// The following logic is mirrored in nsHTMLDocument::StartDocumentLoad!
//
nsCOMPtr<nsIMarkupDocumentViewer> 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<nsIMarkupDocumentViewer> oldMUDV = do_QueryInterface(mContentViewer);
PRUnichar *defaultCharset=nsnull;
PRUnichar *forceCharset=nsnull;
PRUnichar *hintCharset=nsnull;