Bug 541486: Prune unneeded interfaces from HttpChannelChild. author=jduell, r=bsmedberg

- We copied the full list of interfaces from nsHttpChannel, but biesi tells me
  the following will not be needed, so removing: nsIRequestObserver,
  nsIStreamListener, nsICacheListener, nsITransportEventSink,
  nsIProtocolProxyCallback, nsIAuthPromptCallback.
This commit is contained in:
Jason Duell 2010-01-22 13:01:44 -08:00
Родитель d6eaddf3ac
Коммит a29bc0116b
2 изменённых файлов: 0 добавлений и 109 удалений

Просмотреть файл

@ -193,22 +193,16 @@ NS_INTERFACE_MAP_BEGIN(HttpChannelChild)
NS_INTERFACE_MAP_ENTRY(nsIChannel)
NS_INTERFACE_MAP_ENTRY(nsIHttpChannel)
NS_INTERFACE_MAP_ENTRY(nsIHttpChannelInternal)
NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
NS_INTERFACE_MAP_ENTRY(nsICachingChannel)
NS_INTERFACE_MAP_ENTRY(nsIUploadChannel)
NS_INTERFACE_MAP_ENTRY(nsIUploadChannel2)
NS_INTERFACE_MAP_ENTRY(nsICacheListener)
NS_INTERFACE_MAP_ENTRY(nsIEncodedChannel)
NS_INTERFACE_MAP_ENTRY(nsIResumableChannel)
NS_INTERFACE_MAP_ENTRY(nsITransportEventSink)
NS_INTERFACE_MAP_ENTRY(nsISupportsPriority)
NS_INTERFACE_MAP_ENTRY(nsIProtocolProxyCallback)
NS_INTERFACE_MAP_ENTRY(nsIProxiedChannel)
NS_INTERFACE_MAP_ENTRY(nsITraceableChannel)
NS_INTERFACE_MAP_ENTRY(nsIApplicationCacheContainer)
NS_INTERFACE_MAP_ENTRY(nsIApplicationCacheChannel)
NS_INTERFACE_MAP_ENTRY(nsIAuthPromptCallback)
NS_INTERFACE_MAP_END_INHERITING(nsHashPropertyBag)
//-----------------------------------------------------------------------------
@ -785,39 +779,6 @@ HttpChannelChild::SetForceAllowThirdPartyCookie(PRBool force)
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsIRequestObserver
//-----------------------------------------------------------------------------
NS_IMETHODIMP
HttpChannelChild::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
{
DROP_DEAD();
}
NS_IMETHODIMP
HttpChannelChild::OnStopRequest(nsIRequest *aRequest,
nsISupports *aContext,
nsresult aStatusCode)
{
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsIStreamListener
//-----------------------------------------------------------------------------
NS_IMETHODIMP
HttpChannelChild::OnDataAvailable(nsIRequest *aRequest,
nsISupports *aContext,
nsIInputStream *aInputStream,
PRUint32 aOffset,
PRUint32 aCount)
{
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsICachingChannel
//-----------------------------------------------------------------------------
@ -932,18 +893,6 @@ HttpChannelChild::ExplicitSetUploadStream(nsIInputStream *aStream,
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsICacheListener
//-----------------------------------------------------------------------------
NS_IMETHODIMP
HttpChannelChild::OnCacheEntryAvailable(nsICacheEntryDescriptor *descriptor,
nsCacheAccessMode accessGranted,
nsresult status)
{
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsIEncodedChannel
//-----------------------------------------------------------------------------
@ -967,19 +916,6 @@ HttpChannelChild::SetApplyConversion(PRBool aApplyConversion)
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsITransportEventSink
//-----------------------------------------------------------------------------
NS_IMETHODIMP
HttpChannelChild::OnTransportStatus(nsITransport *aTransport,
nsresult aStatus,
PRUint64 aProgress,
PRUint64 aProgressMax)
{
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsIResumableChannel
//-----------------------------------------------------------------------------
@ -1017,19 +953,6 @@ HttpChannelChild::AdjustPriority(PRInt32 delta)
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsIProtocolProxyCallback
//-----------------------------------------------------------------------------
NS_IMETHODIMP
HttpChannelChild::OnProxyAvailable(nsICancelable *aRequest,
nsIURI *aURI,
nsIProxyInfo *aProxyInfo,
nsresult aStatus)
{
DROP_DEAD();
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsIProxiedChannel
//-----------------------------------------------------------------------------
@ -1100,23 +1023,6 @@ HttpChannelChild::SetChooseApplicationCache(PRBool aChooseApplicationCache)
return NS_OK;
}
//-----------------------------------------------------------------------------
// HttpChannelChild::nsIAuthPromptCallback
//-----------------------------------------------------------------------------
NS_IMETHODIMP
HttpChannelChild::OnAuthAvailable(nsISupports *context,
nsIAuthInformation *aAuthInfo)
{
DROP_DEAD();
}
NS_IMETHODIMP
HttpChannelChild::OnAuthCancelled(nsISupports *aContext, PRBool userCancel)
{
DROP_DEAD();
}
//------------------------------------------------------------------------------
}} // mozilla::net

Просмотреть файл

@ -55,19 +55,15 @@
#include "nsIInterfaceRequestorUtils.h"
#include "nsIProgressEventSink.h"
#include "nsICachingChannel.h"
#include "nsICacheListener.h"
#include "nsIApplicationCache.h"
#include "nsIApplicationCacheChannel.h"
#include "nsIEncodedChannel.h"
#include "nsITransport.h"
#include "nsIUploadChannel.h"
#include "nsIUploadChannel2.h"
#include "nsIResumableChannel.h"
#include "nsISupportsPriority.h"
#include "nsIProtocolProxyCallback.h"
#include "nsIProxiedChannel.h"
#include "nsITraceableChannel.h"
#include "nsIAuthPromptCallback.h"
namespace mozilla {
@ -87,20 +83,15 @@ class HttpChannelChild : public PHttpChannelChild
, public nsIHttpChannel
, public nsHashPropertyBag
, public nsIHttpChannelInternal
, public nsIStreamListener
, public nsICachingChannel
, public nsIUploadChannel
, public nsIUploadChannel2
, public nsICacheListener
, public nsIEncodedChannel
, public nsITransportEventSink
, public nsIResumableChannel
, public nsISupportsPriority
, public nsIProtocolProxyCallback
, public nsIProxiedChannel
, public nsITraceableChannel
, public nsIApplicationCacheChannel
, public nsIAuthPromptCallback
{
public:
NS_DECL_ISUPPORTS_INHERITED
@ -108,22 +99,16 @@ public:
NS_DECL_NSICHANNEL
NS_DECL_NSIHTTPCHANNEL
NS_DECL_NSIHTTPCHANNELINTERNAL
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSISTREAMLISTENER
NS_DECL_NSICACHINGCHANNEL
NS_DECL_NSIUPLOADCHANNEL
NS_DECL_NSIUPLOADCHANNEL2
NS_DECL_NSICACHELISTENER
NS_DECL_NSIENCODEDCHANNEL
NS_DECL_NSITRANSPORTEVENTSINK
NS_DECL_NSIRESUMABLECHANNEL
NS_DECL_NSISUPPORTSPRIORITY
NS_DECL_NSIPROTOCOLPROXYCALLBACK
NS_DECL_NSIPROXIEDCHANNEL
NS_DECL_NSITRACEABLECHANNEL
NS_DECL_NSIAPPLICATIONCACHECONTAINER
NS_DECL_NSIAPPLICATIONCACHECHANNEL
NS_DECL_NSIAUTHPROMPTCALLBACK
HttpChannelChild();
virtual ~HttpChannelChild();