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

Part of docshell/webshell landing prep work. The doc loader is being re-factored into the uri loader.

Browse Source 
api synch of changes to nsIURIContentListener
r=travis


git-svn-id: svn://10.0.0.236/trunk@59172 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mscott%netscape.com
2000-01-29 06:10:54 +00:00
parent a1e4f622d9
commit 4c7dddd4de
3 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
#include "nsIDocumentViewer.h"
#include "nsIDocumentLoaderFactory.h"
#include "nsIDeviceContext.h"
#include "nsCURILoader.h"
#include "nsLayoutCID.h"
@@ -147,13 +148,17 @@ NS_IMETHODIMP nsDocShell::LoadURIVia(nsIURI* aUri,
// first, open a channel for the url
nsCOMPtr<nsIChannel> channel;
nsCOMPtr<nsIInterfaceRequestor> capabilities (do_QueryInterface(NS_STATIC_CAST(nsIDocShell *, this)));
nsCOMPtr<nsILoadGroup> loadGroup(do_QueryInterface(mLoadCookie));
// we need to get the load group from our load cookie so we can pass it into open uri...
nsCOMPtr<nsILoadGroup> loadGroup;
NS_ENSURE_SUCCESS(uriLoader->GetLoadGroupForContext(NS_STATIC_CAST(nsISupports *, (nsIDocShell *) this), getter_AddRefs(loadGroup)),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(NS_OpenURI(getter_AddRefs(channel), aUri, loadGroup, capabilities), NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(uriLoader->OpenURIVia(channel, nsIURILoader::viewNormal, nsnull,
NS_STATIC_CAST(nsIDocShell*, this), mLoadCookie,
getter_AddRefs(mLoadCookie), aAdapterBinding), NS_ERROR_FAILURE);
NS_STATIC_CAST(nsIDocShell*, this), aAdapterBinding), NS_ERROR_FAILURE);
return NS_OK;
}
@@ -356,8 +361,7 @@ NS_IMETHODIMP nsDocShell::GetParentURIContentListener(nsIURIContentListener**
NS_ENSURE_ARG_POINTER(aParent);
NS_ENSURE_SUCCESS(EnsureContentListener(), NS_ERROR_FAILURE);
mContentListener->GetParentContentListener(aParent);
return NS_OK;
return mContentListener->GetParentContentListener(aParent);
}
NS_IMETHODIMP nsDocShell::SetParentURIContentListener(nsIURIContentListener*
@@ -365,8 +369,7 @@ NS_IMETHODIMP nsDocShell::SetParentURIContentListener(nsIURIContentListener*
{
NS_ENSURE_SUCCESS(EnsureContentListener(), NS_ERROR_FAILURE);
mContentListener->SetParentContentListener(aParent);
return NS_OK;
return mContentListener->SetParentContentListener(aParent);
}
NS_IMETHODIMP nsDocShell::GetPrefs(nsIPref** aPrefs)