From ae26d6faa6458cb12d0f8324428ea3a0a9a23f20 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Thu, 12 Oct 2000 05:40:38 +0000 Subject: [PATCH] Bug #47636 --> add methods to convert back and forth between a nsIDocShellLoadTypeInfo 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/branches/Netscape_20000922_BRANCH@81003 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/uriloader/base/nsIURILoader.idl | 5 ++--- mozilla/uriloader/base/nsURILoader.cpp | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/mozilla/uriloader/base/nsIURILoader.idl b/mozilla/uriloader/base/nsIURILoader.idl index 7ba1ae05f24..7a77fe69553 100644 --- a/mozilla/uriloader/base/nsIURILoader.idl +++ b/mozilla/uriloader/base/nsIURILoader.idl @@ -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 */ diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp index de372433a40..83774108ce5 100644 --- a/mozilla/uriloader/base/nsURILoader.cpp +++ b/mozilla/uriloader/base/nsURILoader.cpp @@ -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 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 treeItemCtxt (do_QueryInterface(treeItem));