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

Backing out last checkins

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@130169 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2002-09-20 20:06:33 +00:00
parent 5a23a56663
commit 215283d7be
3 changed files with 40 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4726,7 +4726,7 @@ nsDocShell::InternalLoad(nsIURI * aURI,
nsIRequest** aRequest)
{
nsresult rv = NS_OK;
// Initialize aDocShell/aRequest
if (aDocShell) {
*aDocShell = nsnull;
@@ -4735,15 +4735,6 @@ nsDocShell::InternalLoad(nsIURI * aURI,
*aRequest = nsnull;
}
// wyciwyg urls can only be loaded through history. Any normal load of
// wyciwyg through docshell is illegal. Disallow such loads.
if (aURI && (aLoadType & LOAD_CMD_NORMAL)) {
PRBool isWyciwyg = PR_FALSE;
rv = aURI->SchemeIs("wyciwyg", &isWyciwyg);
if ((isWyciwyg && NS_SUCCEEDED(rv)) || NS_FAILED(rv))
return NS_ERROR_FAILURE;
}
//
// First, notify any nsIContentPolicy listeners about the document load.
// Only abort the load if a content policy listener explicitly vetos it!