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

Bug #47636 --> add methods to convert back and forth between a nsIDocShellLoadTypeInfo

Browse Source 
and a docshell load tye. Unify nsIURILoadCommand and nsIDocShellLoadType enums so they
can be treated as the same type. This allows the uriloader to pass the correct load info
from the docshell that originates the load over to the docshell that actually
ends up loading the url.
r=radha, sr=rpotts


git-svn-id: svn://10.0.0.236/trunk@80964 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mscott%netscape.com
2000-10-11 23:14:38 +00:00
parent 8ef014a604
commit 02fd4611b5
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/uriloader/base/nsIURILoader.idl
View File

@@ -107,9 +107,8 @@ interface nsIURILoader : nsISupports
/* these are nsURILoadCommand */
const long viewNormal = 0;
const long viewUserClick = 1;
const long viewNewWindow = 2;
const long viewNormalBackground = 3;
const long viewUserClick = 7;
const long viewNormalBackground = 0;
/* mscott -> I'm going to move this out into a separate private interface
*/

12
mozilla/uriloader/base/nsURILoader.cpp
View File

@@ -549,18 +549,6 @@ NS_IMETHODIMP nsURILoader::GetTarget(nsIChannel * aChannel, const char * aWindow
else
{
windowCtxtAsTreeItem->FindItemWithName(name.GetUnicode(), nsnull, getter_AddRefs(treeItem));
// this is a bit hokey.....if we retargted this content to a different window
// during GetTarget, then tweak the load attributes on the channel to set the
// LOAD_RETARGETED_DOCUMENT_URI flag...
nsCOMPtr<nsISupports> retargetedWindowCtxt = do_QueryInterface(treeItem);
if (retargetedWindowCtxt && (aWindowContext != retargetedWindowCtxt.get()))
{
// we must be retargeting...so set an appropriate flag on the channel
nsLoadFlags loadAttribs = 0;
aChannel->GetLoadAttributes(&loadAttribs);
loadAttribs |= nsIChannel::LOAD_RETARGETED_DOCUMENT_URI;
aChannel->SetLoadAttributes(loadAttribs);
}
}
nsCOMPtr<nsISupports> treeItemCtxt (do_QueryInterface(treeItem));