Bug 46864 - Embedding needs a name attribute on nsIRequest.

chrome/src/nsChromeProtocolHandler.cpp

@@ -116,6 +116,10 @@ public:
     NS_DECL_ISUPPORTS
 
     // nsIRequest
+    NS_IMETHOD GetName(PRUnichar* *result) { 
+        NS_NOTREACHED("nsCachedChromeChannel::GetName");
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
     NS_IMETHOD IsPending(PRBool *_retval) { *_retval = PR_TRUE; return NS_OK; }
     NS_IMETHOD GetStatus(nsresult *status) { *status = mStatus; return NS_OK; }
     NS_IMETHOD Cancel(nsresult status)  { mStatus = status; return NS_OK; }

content/xul/document/src/nsXULDocument.cpp

@@ -319,6 +319,10 @@ public:
     NS_DECL_ISUPPORTS
 
 	// nsIRequest
+    NS_IMETHOD GetName(PRUnichar* *result) { 
+        NS_NOTREACHED("PlaceholderChannel::GetName");
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
     NS_IMETHOD IsPending(PRBool *_retval) { *_retval = PR_TRUE; return NS_OK; }
     NS_IMETHOD GetStatus(nsresult *status) { *status = NS_OK; return NS_OK; } 
     NS_IMETHOD Cancel(nsresult status)  { return NS_OK; }

extensions/datetime/nsDateTimeChannel.cpp

@@ -79,6 +79,13 @@ nsDateTimeChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsDateTimeChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsDateTimeChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsDateTimeChannel::IsPending(PRBool *result)
 {

extensions/finger/nsFingerChannel.cpp

@@ -119,6 +119,13 @@ nsFingerChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsFingerChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsFingerChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsFingerChannel::IsPending(PRBool *result)
 {

extensions/xmlextras/base/src/nsDOMParser.cpp

@@ -85,6 +85,12 @@ nsDOMParserChannel::~nsDOMParserChannel()
 NS_IMPL_ISUPPORTS2(nsDOMParserChannel, nsIRequest, nsIChannel)
 
 /* boolean isPending (); */
+NS_IMETHODIMP nsDOMParserChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsDOMParserChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP 
 nsDOMParserChannel::IsPending(PRBool *_retval)
 {

mailnews/base/util/nsMsgProtocol.cpp

@@ -598,6 +598,14 @@ nsMsgProtocol::GetSecurityInfo(nsISupports * *aSecurityInfo)
 // From nsIRequest
 ////////////////////////////////////////////////////////////////////////////////
 
+NS_IMETHODIMP nsMsgProtocol::GetName(PRUnichar* *result)
+{
+    if (m_channel)
+        return m_channel->GetName(result);
+    NS_NOTREACHED("nsMsgProtocol::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP nsMsgProtocol::IsPending(PRBool *result)
 {
     *result = PR_TRUE;

mailnews/compose/src/nsSmtpService.cpp

@@ -479,6 +479,12 @@ NS_IMETHODIMP nsMailtoChannel::SetOwner(nsISupports * aPrincipal)
 // From nsIRequest
 ////////////////////////////////////////////////////////////////////////////////
 
+NS_IMETHODIMP nsMailtoChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsMailtoChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP nsMailtoChannel::IsPending(PRBool *result)
 {
     *result = PR_TRUE;

mailnews/imap/src/nsImapProtocol.cpp

@@ -7001,6 +7001,12 @@ NS_IMETHODIMP nsImapMockChannel::SetOwner(nsISupports * aPrincipal)
 // From nsIRequest
 ////////////////////////////////////////////////////////////////////////////////
 
+NS_IMETHODIMP nsImapMockChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsImapMockChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP nsImapMockChannel::IsPending(PRBool *result)
 {
     *result = PR_TRUE;

modules/libjar/nsJARChannel.cpp

@@ -209,6 +209,19 @@ nsJARChannel::Init(nsIJARProtocolHandler* aHandler, nsIURI* uri)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods
 
+NS_IMETHODIMP
+nsJARChannel::GetName(PRUnichar* *result)
+{
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mURI->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsJARChannel::IsPending(PRBool* result)
 {

netwerk/base/public/nsIRequest.idl

@@ -25,6 +25,11 @@
 [scriptable, uuid(F2CAABA0-2F25-11d3-A164-0050041CAF44)]
 interface nsIRequest : nsISupports
 {
+    /**
+     * Returns the name of the request. Often this is the URL of the request.
+     */
+    readonly attribute wstring name;
+
     /**
      * Returns true if the request is pending (active). Returns false 
      * after completion or successful calling Cancel. Suspended requests

netwerk/base/src/nsFileTransport.cpp

@@ -167,6 +167,15 @@ nsFileTransport::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
 // From nsIRequest
 ////////////////////////////////////////////////////////////////////////////////
 
+NS_IMETHODIMP
+nsFileTransport::GetName(PRUnichar* *result)
+{
+    nsString name;
+    name.AppendWithConversion(mStreamName);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsFileTransport::IsPending(PRBool *result)
 {

netwerk/base/src/nsInputStreamChannel.cpp

@@ -27,6 +27,7 @@
 #include "nsIMIMEService.h"
 #include "nsIFileTransportService.h"
 #include "netCore.h"
+#include "nsXPIDLString.h"
 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
@@ -181,6 +182,19 @@ NS_IMPL_THREADSAFE_ISUPPORTS5(nsStreamIOChannel,
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsStreamIOChannel::GetName(PRUnichar* *result)
+{
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mURI->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsStreamIOChannel::IsPending(PRBool *result)
 {

netwerk/base/src/nsLoadGroup.cpp

@@ -32,6 +32,8 @@
 #include "prlog.h"
 #include "nsCRT.h"
 #include "netCore.h"
+#include "nsXPIDLString.h"
+#include "nsString.h"
 
 #if defined(PR_LOGGING)
 //
@@ -150,6 +152,25 @@ nsLoadGroup::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsLoadGroup::GetName(PRUnichar* *result)
+{
+    // XXX is this the right "name" for a load group?
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    if (mDefaultLoadChannel) {
+        nsCOMPtr<nsIURI> url;
+        rv = mDefaultLoadChannel->GetURI(getter_AddRefs(url));
+        if (NS_FAILED(rv)) return rv;
+        rv = url->GetSpec(getter_Copies(urlStr));
+        if (NS_FAILED(rv)) return rv;
+    }
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsLoadGroup::IsPending(PRBool *aResult)
 {

netwerk/base/src/nsSocketTransport.cpp

@@ -1507,6 +1507,18 @@ nsSocketTransport::GetSecurityInfo(nsISupports **info)
 // nsIRequest implementation...
 // --------------------------------------------------------------------------
 //
+
+NS_IMETHODIMP
+nsSocketTransport::GetName(PRUnichar* *result)
+{
+    nsString name;
+    name.AppendWithConversion(mHostName);
+    name.AppendWithConversion(":");
+    name.AppendInt(mPort);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsSocketTransport::IsPending(PRBool *result)
 {

netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp

@@ -179,6 +179,13 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsDiskCacheRecordChannel,
                    nsIStreamObserver)
 
 // implement nsIRequest
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetName(PRUnichar* *result)
+{
+  NS_NOTREACHED("nsDiskCacheRecordChannel::GetName");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsDiskCacheRecordChannel::IsPending(PRBool *aIsPending) 
 {

netwerk/cache/memcache/nsMemCacheChannel.cpp

@@ -339,6 +339,13 @@ nsMemCacheChannel::~nsMemCacheChannel()
     mRecord->mNumChannels--;
 }
 
+NS_IMETHODIMP
+nsMemCacheChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsMemCacheChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsMemCacheChannel::IsPending(PRBool* aIsPending)
 {

netwerk/dns/src/nsDnsService.cpp

@@ -283,6 +283,13 @@ nsDNSRequest::FireStop(nsresult status)
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDNSRequest::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsDNSRequest::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsDNSRequest::IsPending(PRBool *result)
 {

netwerk/protocol/data/src/nsDataChannel.cpp

@@ -225,6 +225,13 @@ nsDataChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsDataChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsDataChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsDataChannel::IsPending(PRBool *result)
 {

netwerk/protocol/datetime/src/nsDateTimeChannel.cpp

@@ -79,6 +79,13 @@ nsDateTimeChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsDateTimeChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsDateTimeChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsDateTimeChannel::IsPending(PRBool *result)
 {

netwerk/protocol/file/src/nsFileChannel.cpp

@@ -115,6 +115,21 @@ nsFileChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
 // From nsIRequest
 ////////////////////////////////////////////////////////////////////////////////
 
+NS_IMETHODIMP
+nsFileChannel::GetName(PRUnichar* *result)
+{
+    if (mFileTransport)
+        return mFileTransport->GetName(result);
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mURI->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsFileChannel::IsPending(PRBool *result)
 {

netwerk/protocol/finger/src/nsFingerChannel.cpp

@@ -119,6 +119,13 @@ nsFingerChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsFingerChannel::GetName(PRUnichar* *result)
+{
+    NS_NOTREACHED("nsFingerChannel::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 nsFingerChannel::IsPending(PRBool *result)
 {

netwerk/protocol/ftp/src/nsFTPChannel.cpp

@@ -134,6 +134,21 @@ nsFTPChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
 // FTP connection thread using an xpcom proxy object to make the
 // cross thread call.
 
+NS_IMETHODIMP
+nsFTPChannel::GetName(PRUnichar* *result)
+{
+    if (mProxyChannel)
+        return mProxyChannel->GetName(result);
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mURL->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsFTPChannel::IsPending(PRBool *result) {
     nsAutoLock lock(mLock);

netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp

@@ -1656,6 +1656,19 @@ nsFtpConnectionThread::Run() {
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsFtpConnectionThread::GetName(PRUnichar* *result)
+{
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mURL->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsFtpConnectionThread::IsPending(PRBool *result)
 {

netwerk/protocol/http/src/nsHTTPChannel.cpp

@@ -156,6 +156,12 @@ NS_IMPL_THREADSAFE_ISUPPORTS7(nsHTTPChannel,
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsHTTPChannel::GetName(PRUnichar* *result)
+{
+  return mRequest->GetName(result);
+}
+
 NS_IMETHODIMP
 nsHTTPChannel::IsPending(PRBool *result)
 {

netwerk/protocol/http/src/nsHTTPRequest.cpp

@@ -114,6 +114,22 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsHTTPRequest, nsIRequest)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
+NS_IMETHODIMP
+nsHTTPRequest::GetName(PRUnichar* *result)
+{
+    if (mPipelinedRequest)
+        return mPipelinedRequest->GetName(result);
+
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mURI->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsHTTPRequest::IsPending(PRBool *result)
 {
@@ -949,6 +965,16 @@ nsHTTPPipelinedRequest::RestartRequest(PRUint32 aType)
     return rval;
 }
 
+nsresult
+nsHTTPPipelinedRequest::GetName(PRUnichar* *result)
+{
+    if (mTransport)
+        return mTransport->GetName(result);
+
+    NS_NOTREACHED("nsHTTPPipelinedRequest::GetName");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 nsresult
 nsHTTPPipelinedRequest::IsPending(PRBool *result)
 {

netwerk/protocol/http/src/nsHTTPRequest.h

@@ -206,6 +206,7 @@ public:
     nsresult    AdvanceToNextRequest ();
     nsresult    RestartRequest (PRUint32 flags);
 
+    nsresult    GetName(PRUnichar* *result);
     nsresult    IsPending (PRBool *result);
     nsresult    Cancel  (nsresult status );
     nsresult    Suspend ();

netwerk/protocol/jar/src/nsJARChannel.cpp

@@ -209,6 +209,19 @@ nsJARChannel::Init(nsIJARProtocolHandler* aHandler, nsIURI* uri)
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods
 
+NS_IMETHODIMP
+nsJARChannel::GetName(PRUnichar* *result)
+{
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mURI->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsJARChannel::IsPending(PRBool* result)
 {

netwerk/protocol/res/src/nsResChannel.cpp

@@ -163,6 +163,19 @@ nsResChannel::Substitutions::Next(char* *result)
 // nsIRequest methods:
 ////////////////////////////////////////////////////////////////////////////////
 
+NS_IMETHODIMP
+nsResChannel::GetName(PRUnichar* *result)
+{
+    nsresult rv;
+    nsXPIDLCString urlStr;
+    rv = mResourceURI->GetSpec(getter_Copies(urlStr));
+    if (NS_FAILED(rv)) return rv;
+    nsString name;
+    name.AppendWithConversion(urlStr);
+    *result = name.ToNewUnicode();
+    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
 NS_IMETHODIMP
 nsResChannel::IsPending(PRBool *result)
 {

rdf/chrome/src/nsChromeProtocolHandler.cpp

@@ -116,6 +116,10 @@ public:
     NS_DECL_ISUPPORTS
 
     // nsIRequest
+    NS_IMETHOD GetName(PRUnichar* *result) { 
+        NS_NOTREACHED("nsCachedChromeChannel::GetName");
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
     NS_IMETHOD IsPending(PRBool *_retval) { *_retval = PR_TRUE; return NS_OK; }
     NS_IMETHOD GetStatus(nsresult *status) { *status = mStatus; return NS_OK; }
     NS_IMETHOD Cancel(nsresult status)  { mStatus = status; return NS_OK; }

rdf/content/src/nsXULDocument.cpp

@@ -319,6 +319,10 @@ public:
     NS_DECL_ISUPPORTS
 
 	// nsIRequest
+    NS_IMETHOD GetName(PRUnichar* *result) { 
+        NS_NOTREACHED("PlaceholderChannel::GetName");
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
     NS_IMETHOD IsPending(PRBool *_retval) { *_retval = PR_TRUE; return NS_OK; }
     NS_IMETHOD GetStatus(nsresult *status) { *status = NS_OK; return NS_OK; } 
     NS_IMETHOD Cancel(nsresult status)  { return NS_OK; }