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

Additional changes related to previous checkin for bug 151061. More error checking per discussion in the bug.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@130090 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
radha%netscape.com
2002-09-20 00:03:03 +00:00
parent 883c78f856
commit f0e694f871
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -3953,18 +3953,16 @@ nsDocShell::Embed(nsIContentViewer * aContentViewer,
// the document to the original http url that created the document.write().
// This makes sure that all relative urls in a document.written page loaded
// via history work properly.
PRBool historyLoad = PR_FALSE, isWyciwyg = PR_FALSE;
if (mLoadType & LOAD_CMD_HISTORY ||
if (mCurrentURI &&
(mLoadType & LOAD_CMD_HISTORY ||
mLoadType == LOAD_RELOAD_NORMAL ||
mLoadType == LOAD_RELOAD_CHARSET_CHANGE)
historyLoad = PR_TRUE;
rv = mCurrentURI->SchemeIs("wyciwyg", &isWyciwyg);
if (historyLoad && NS_SUCCEEDED(rv) && isWyciwyg)
SetBaseUrlForWyciwyg(aContentViewer);
mLoadType == LOAD_RELOAD_CHARSET_CHANGE)){
PRBool isWyciwyg = PR_FALSE;
// Check if the url is wyciwyg
rv = mCurrentURI->SchemeIs("wyciwyg", &isWyciwyg);
if (isWyciwyg && NS_SUCCEEDED(rv))
SetBaseUrlForWyciwyg(aContentViewer);
}
// XXX What if SetupNewViewer fails?
if (mLSHE)
mOSHE = mLSHE;