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

Move documentURI to a new interface. b=157133. r=rpotts@netscape.com, sr=darin@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@130841 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2002-09-30 23:18:43 +00:00
parent 31397579e1
commit 5b28814356
11 changed files with 141 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/extensions/cookie/nsCookieHTTPNotify.cpp
View File

@@ -58,6 +58,11 @@
#include "nsIInterfaceRequestorUtils.h"
#include "nsIPrompt.h"
// we want to explore making the document own the load group
// so we can associate the document URI with the load group.
// until this point, we have an evil hack:
#include "nsIHttpChannelInternal.h"
static NS_DEFINE_CID(kINetModuleMgrCID, NS_NETMODULEMGR_CID);
///////////////////////////////////
@@ -165,9 +170,12 @@ nsCookieHTTPNotify::OnModifyRequest(nsIHttpChannel *aHttpChannel)
rv = aHttpChannel->GetURI(getter_AddRefs(pURL));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIHttpChannelInternal> httpInternal = do_QueryInterface(aHttpChannel);
NS_ENSURE_TRUE(httpInternal, NS_ERROR_UNEXPECTED);
// Get the original url that the user either typed in or clicked on
nsCOMPtr<nsIURI> pFirstURL;
rv = aHttpChannel->GetDocumentURI(getter_AddRefs(pFirstURL));
rv = httpInternal->GetDocumentURI(getter_AddRefs(pFirstURL));
if (NS_FAILED(rv)) return rv;
if (!pFirstURL) {
rv = aHttpChannel->GetOriginalURI(getter_AddRefs(pFirstURL));
@@ -213,9 +221,12 @@ nsCookieHTTPNotify::OnExamineResponse(nsIHttpChannel *aHttpChannel)
rv = aHttpChannel->GetURI(getter_AddRefs(pURL));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIHttpChannelInternal> httpInternal = do_QueryInterface(aHttpChannel);
NS_ENSURE_TRUE(httpInternal, NS_ERROR_UNEXPECTED);
// Get the original url that the user either typed in or clicked on
nsCOMPtr<nsIURI> pFirstURL;
rv = aHttpChannel->GetDocumentURI(getter_AddRefs(pFirstURL));
rv = httpInternal->GetDocumentURI(getter_AddRefs(pFirstURL));
if (NS_FAILED(rv)) return rv;
// Get the prompter