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

loading a uri takes the channel instead of the uri. The caller

Browse Source 
must create the channel before call openuri.
r=rpotts.


git-svn-id: svn://10.0.0.236/trunk@58024 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mscott%netscape.com
2000-01-17 19:56:31 +00:00
parent 592458c0f5
commit 30c9c2ebf9
5 changed files with 113 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,14 +138,21 @@ NS_IMETHODIMP nsDocShell::LoadURIVia(nsIURI* aUri,
{
NS_ENSURE_ARG(aUri);
nsCOMPtr<nsIURILoader> uriLoader = do_CreateInstance(NS_URI_LOADER_PROGID);
nsCOMPtr<nsIURILoader> uriLoader = do_GetService(NS_URI_LOADER_PROGID);
NS_ENSURE_TRUE(uriLoader, NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(EnsureContentListener(), NS_ERROR_FAILURE);
mContentListener->SetPresContext(aPresContext);
NS_ENSURE_SUCCESS(uriLoader->OpenURIVia(aUri, nsIURILoader::viewNormal, nsnull,
NS_STATIC_CAST(nsIDocShell*, this), nsnull, mLoadCookie,
// 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));
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);
return NS_OK;