Bug 394114 Interfaces missing from various QI implementations.
r=jag sr=jag a=dsicore git-svn-id: svn://10.0.0.236/trunk@249689 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
20a0f0e41e
commit
a799ff972a
@ -69,7 +69,10 @@
|
||||
|
||||
#define MAX_BYTES 512
|
||||
|
||||
NS_IMPL_ISUPPORTS2(nsFeedSniffer, nsIContentSniffer, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS3(nsFeedSniffer,
|
||||
nsIContentSniffer,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
nsresult
|
||||
nsFeedSniffer::ConvertEncodedData(nsIRequest* request,
|
||||
|
||||
@ -123,6 +123,7 @@ NS_INTERFACE_MAP_BEGIN(nsDOMParser)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMParser)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMParserJS)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMLoadListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer)
|
||||
NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(DOMParser)
|
||||
|
||||
@ -73,8 +73,8 @@ public:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED2(nsGenConImageContent, nsXMLElement,
|
||||
nsIImageLoadingContent, imgIDecoderObserver)
|
||||
NS_IMPL_ISUPPORTS_INHERITED3(nsGenConImageContent, nsXMLElement,
|
||||
nsIImageLoadingContent, imgIContainerObserver, imgIDecoderObserver)
|
||||
|
||||
nsresult
|
||||
NS_NewGenConImageContent(nsIContent** aResult, nsINodeInfo* aNodeInfo,
|
||||
|
||||
@ -154,8 +154,9 @@ nsSyncLoader::~nsSyncLoader()
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS4(nsSyncLoader,
|
||||
NS_IMPL_ISUPPORTS5(nsSyncLoader,
|
||||
nsIDOMLoadListener,
|
||||
nsIDOMEventListener,
|
||||
nsIChannelEventSink,
|
||||
nsIInterfaceRequestor,
|
||||
nsISupportsWeakReference)
|
||||
|
||||
@ -192,12 +192,13 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLImageElement, nsGenericElement)
|
||||
|
||||
// QueryInterface implementation for nsHTMLImageElement
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_HEAD(nsHTMLImageElement, nsGenericHTMLElement)
|
||||
NS_INTERFACE_TABLE_INHERITED5(nsHTMLImageElement,
|
||||
NS_INTERFACE_TABLE_INHERITED6(nsHTMLImageElement,
|
||||
nsIDOMHTMLImageElement,
|
||||
nsIDOMNSHTMLImageElement,
|
||||
nsIJSNativeInitializer,
|
||||
imgIDecoderObserver,
|
||||
nsIImageLoadingContent)
|
||||
nsIImageLoadingContent,
|
||||
imgIContainerObserver)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLImageElement)
|
||||
|
||||
|
||||
|
||||
@ -410,16 +410,17 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLInputElement, nsGenericElement)
|
||||
// QueryInterface implementation for nsHTMLInputElement
|
||||
NS_HTML_CONTENT_CC_INTERFACE_TABLE_HEAD(nsHTMLInputElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_INHERITED9(nsHTMLInputElement,
|
||||
nsIDOMHTMLInputElement,
|
||||
nsIDOMNSHTMLInputElement,
|
||||
nsITextControlElement,
|
||||
nsIFileControlElement,
|
||||
nsIRadioControlElement,
|
||||
nsIPhonetic,
|
||||
imgIDecoderObserver,
|
||||
nsIImageLoadingContent,
|
||||
nsIDOMNSEditableElement)
|
||||
NS_INTERFACE_TABLE_INHERITED10(nsHTMLInputElement,
|
||||
nsIDOMHTMLInputElement,
|
||||
nsIDOMNSHTMLInputElement,
|
||||
nsITextControlElement,
|
||||
nsIFileControlElement,
|
||||
nsIRadioControlElement,
|
||||
nsIPhonetic,
|
||||
imgIDecoderObserver,
|
||||
nsIImageLoadingContent,
|
||||
imgIContainerObserver,
|
||||
nsIDOMNSEditableElement)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLInputElement)
|
||||
|
||||
|
||||
|
||||
@ -168,16 +168,17 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLObjectElement, nsGenericElement)
|
||||
|
||||
NS_HTML_CONTENT_CC_INTERFACE_TABLE_HEAD(nsHTMLObjectElement,
|
||||
nsGenericHTMLFormElement)
|
||||
NS_INTERFACE_TABLE_INHERITED9(nsHTMLObjectElement,
|
||||
nsIDOMHTMLObjectElement,
|
||||
imgIDecoderObserver,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener,
|
||||
nsIFrameLoaderOwner,
|
||||
nsIObjectLoadingContent,
|
||||
nsIImageLoadingContent,
|
||||
nsIInterfaceRequestor,
|
||||
nsIChannelEventSink)
|
||||
NS_INTERFACE_TABLE_INHERITED10(nsHTMLObjectElement,
|
||||
nsIDOMHTMLObjectElement,
|
||||
imgIDecoderObserver,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener,
|
||||
nsIFrameLoaderOwner,
|
||||
nsIObjectLoadingContent,
|
||||
nsIImageLoadingContent,
|
||||
imgIContainerObserver,
|
||||
nsIInterfaceRequestor,
|
||||
nsIChannelEventSink)
|
||||
NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLObjectElement)
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE(nsHTMLObjectElement)
|
||||
|
||||
@ -213,12 +213,13 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLSharedObjectElement, nsGenericElement)
|
||||
NS_HTML_CONTENT_CC_INTERFACE_TABLE_AMBIGUOUS_HEAD(nsHTMLSharedObjectElement,
|
||||
nsGenericHTMLElement,
|
||||
nsIDOMHTMLAppletElement)
|
||||
NS_INTERFACE_TABLE_INHERITED8(nsHTMLSharedObjectElement,
|
||||
imgIDecoderObserver,
|
||||
NS_INTERFACE_TABLE_INHERITED9(nsHTMLSharedObjectElement,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener,
|
||||
nsIFrameLoaderOwner,
|
||||
imgIContainerObserver,
|
||||
nsIObjectLoadingContent,
|
||||
imgIDecoderObserver,
|
||||
nsIImageLoadingContent,
|
||||
nsIInterfaceRequestor,
|
||||
nsIChannelEventSink)
|
||||
|
||||
@ -112,6 +112,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMSVGZoomEvent, nsDOMEvent)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsDOMSVGZoomEvent)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGZoomEvent)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMUIEvent,nsIDOMSVGZoomEvent)
|
||||
NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGZoomEvent)
|
||||
NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
|
||||
|
||||
|
||||
@ -86,6 +86,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsLoadSaveContentSink)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsLoadSaveContentSink)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIXMLContentSink)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIContentSink)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIExpatSink)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXMLContentSink)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
@ -173,6 +173,7 @@ NS_INTERFACE_MAP_BEGIN(nsWebBrowser)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIScrollable)
|
||||
NS_INTERFACE_MAP_ENTRY(nsITextScroll)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDocShellTreeItem)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDocShellTreeNode)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIWebBrowserSetup)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIWebBrowserPersist)
|
||||
|
||||
@ -229,6 +229,7 @@ NS_INTERFACE_MAP_BEGIN(nsXFormsMessageElement)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIChannelEventSink)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIXFormsActionModuleElement)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
|
||||
NS_INTERFACE_MAP_END_INHERITING(nsXFormsDelegateStub)
|
||||
|
||||
@ -669,6 +669,7 @@ NS_INTERFACE_MAP_BEGIN(nsXFormsModelElement)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISVSchemaErrorHandler)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIXFormsContextControl)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIXFormsControlBase)
|
||||
NS_INTERFACE_MAP_END_INHERITING(nsXFormsStubElement)
|
||||
|
||||
NS_IMPL_ADDREF_INHERITED(nsXFormsModelElement, nsXFormsStubElement)
|
||||
|
||||
@ -153,7 +153,9 @@ class nsComboButtonListener: public nsIDOMMouseListener
|
||||
nsComboboxControlFrame* mComboBox;
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsComboButtonListener, nsIDOMMouseListener)
|
||||
NS_IMPL_ISUPPORTS2(nsComboButtonListener,
|
||||
nsIDOMMouseListener,
|
||||
nsIDOMEventListener)
|
||||
|
||||
// static class data member for Bug 32920
|
||||
nsComboboxControlFrame * nsComboboxControlFrame::mFocused = nsnull;
|
||||
|
||||
@ -612,7 +612,9 @@ NS_IMETHODIMP nsFileControlFrame::GetAccessible(nsIAccessible** aAccessible)
|
||||
////////////////////////////////////////////////////////////
|
||||
// Mouse listener implementation
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsFileControlFrame::MouseListener, nsIDOMMouseListener)
|
||||
NS_IMPL_ISUPPORTS2(nsFileControlFrame::MouseListener,
|
||||
nsIDOMMouseListener,
|
||||
nsIDOMEventListener)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsFileControlFrame::MouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
|
||||
|
||||
@ -252,6 +252,10 @@ nsIsIndexFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
|
||||
*aInstancePtr = static_cast<nsIDOMKeyListener*>(this);
|
||||
return NS_OK;
|
||||
}
|
||||
if (aIID.Equals(NS_GET_IID(nsIDOMEventListener))) {
|
||||
*aInstancePtr = static_cast<nsIDOMEventListener*>(this);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return nsAreaFrame::QueryInterface(aIID, aInstancePtr);
|
||||
}
|
||||
|
||||
@ -602,7 +602,10 @@ private:
|
||||
};
|
||||
|
||||
// Implement our nsISupports methods
|
||||
NS_IMPL_ISUPPORTS2(nsTextInputSelectionImpl, nsISelectionController, nsISupportsWeakReference)
|
||||
NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl,
|
||||
nsISelectionController,
|
||||
nsISelectionDisplay,
|
||||
nsISupportsWeakReference)
|
||||
|
||||
|
||||
// BEGIN nsTextInputSelectionImpl
|
||||
|
||||
@ -79,7 +79,9 @@ inDeepTreeWalker::~inDeepTreeWalker()
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(inDeepTreeWalker, inIDeepTreeWalker)
|
||||
NS_IMPL_ISUPPORTS2(inDeepTreeWalker,
|
||||
inIDeepTreeWalker,
|
||||
nsIDOMTreeWalker)
|
||||
|
||||
////////////////////////////////////////////////////
|
||||
// inIDeepTreeWalker
|
||||
|
||||
@ -68,7 +68,12 @@
|
||||
|
||||
NS_IMPL_ADDREF(nsMenuBarListener)
|
||||
NS_IMPL_RELEASE(nsMenuBarListener)
|
||||
NS_IMPL_QUERY_INTERFACE3(nsMenuBarListener, nsIDOMKeyListener, nsIDOMFocusListener, nsIDOMMouseListener)
|
||||
NS_INTERFACE_MAP_BEGIN(nsMenuBarListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMKeyListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMFocusListener)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener,nsIDOMMouseListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMMouseListener)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
#define MODIFIER_SHIFT 1
|
||||
#define MODIFIER_CONTROL 2
|
||||
|
||||
@ -1145,4 +1145,6 @@ void nsSliderFrame::Notify(void)
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsSliderMediator, nsIDOMMouseListener)
|
||||
NS_IMPL_ISUPPORTS2(nsSliderMediator,
|
||||
nsIDOMMouseListener,
|
||||
nsIDOMEventListener)
|
||||
|
||||
@ -180,7 +180,13 @@ public:
|
||||
};
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS2(nsSplitterFrameInner, nsIDOMMouseListener, nsIDOMMouseMotionListener)
|
||||
NS_IMPL_ADDREF(nsSplitterFrameInner)
|
||||
NS_IMPL_RELEASE(nsSplitterFrameInner)
|
||||
NS_INTERFACE_MAP_BEGIN(nsSplitterFrameInner)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMMouseListener)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener,nsIDOMMouseListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMMouseMotionListener)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
nsSplitterFrameInner::ResizeType
|
||||
nsSplitterFrameInner::GetResizeBefore()
|
||||
|
||||
@ -126,8 +126,12 @@ void nsMenuChainItem::Detach(nsMenuChainItem** aRoot)
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS4(nsXULPopupManager, nsIDOMKeyListener,
|
||||
nsIMenuRollup, nsIRollupListener, nsITimerCallback)
|
||||
NS_IMPL_ISUPPORTS5(nsXULPopupManager,
|
||||
nsIDOMKeyListener,
|
||||
nsIDOMEventListener,
|
||||
nsIMenuRollup,
|
||||
nsIRollupListener,
|
||||
nsITimerCallback)
|
||||
|
||||
nsXULPopupManager::nsXULPopupManager() :
|
||||
mRangeOffset(0),
|
||||
|
||||
@ -2680,7 +2680,11 @@ public:
|
||||
//
|
||||
// nsISupports
|
||||
//
|
||||
NS_IMPL_ISUPPORTS3(nsDelAttachListener,nsIStreamListener,nsIUrlListener,nsIMsgCopyServiceListener)
|
||||
NS_IMPL_ISUPPORTS4(nsDelAttachListener,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIUrlListener,
|
||||
nsIMsgCopyServiceListener)
|
||||
|
||||
//
|
||||
// nsIRequestObserver
|
||||
|
||||
@ -785,7 +785,9 @@ protected:
|
||||
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsMsgSaveAsListener, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS2(nsMsgSaveAsListener,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
nsMsgSaveAsListener::nsMsgSaveAsListener(nsIFile *aFile, PRBool addDummyEnvelope)
|
||||
{
|
||||
|
||||
@ -2782,7 +2782,11 @@ QuotingOutputStreamListener::InsertToCompose(nsIEditor *aEditor,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS2(QuotingOutputStreamListener, nsIMsgQuotingOutputStreamListener, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS3(QuotingOutputStreamListener,
|
||||
nsIMsgQuotingOutputStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////
|
||||
// END OF QUOTING LISTENER
|
||||
////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -47,7 +47,9 @@
|
||||
#include "nsISupportsPrimitives.h"
|
||||
#include "nsIComponentManager.h"
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsMsgComposeProgress, nsIMsgComposeProgress)
|
||||
NS_IMPL_ISUPPORTS2(nsMsgComposeProgress,
|
||||
nsIMsgComposeProgress,
|
||||
nsIWebProgressListener)
|
||||
|
||||
nsMsgComposeProgress::nsMsgComposeProgress()
|
||||
{
|
||||
|
||||
@ -881,7 +881,10 @@ public:
|
||||
char mLastBlockChars[3];
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS2(nsMsgTemplateReplyHelper, nsIStreamListener, nsIUrlListener)
|
||||
NS_IMPL_ISUPPORTS3(nsMsgTemplateReplyHelper,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIUrlListener)
|
||||
|
||||
nsMsgTemplateReplyHelper::nsMsgTemplateReplyHelper()
|
||||
{
|
||||
|
||||
@ -72,7 +72,10 @@
|
||||
#include "nsMsgMimeCID.h"
|
||||
#include "nsComposeStrings.h"
|
||||
|
||||
NS_IMPL_ISUPPORTS2(nsMsgSendLater, nsIMsgSendLater, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS3(nsMsgSendLater,
|
||||
nsIMsgSendLater,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener)
|
||||
|
||||
nsMsgSendLater::nsMsgSendLater()
|
||||
{
|
||||
|
||||
@ -61,7 +61,14 @@
|
||||
#include "nsIStreamConverterService.h"
|
||||
#include "nsIMsgProgress.h"
|
||||
|
||||
NS_IMPL_ISUPPORTS6(nsURLFetcher, nsIURLFetcher, nsIStreamListener, nsIURIContentListener, nsIInterfaceRequestor, nsIWebProgressListener, nsISupportsWeakReference)
|
||||
NS_IMPL_ISUPPORTS7(nsURLFetcher,
|
||||
nsIURLFetcher,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIURIContentListener,
|
||||
nsIInterfaceRequestor,
|
||||
nsIWebProgressListener,
|
||||
nsISupportsWeakReference)
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -96,7 +96,11 @@ static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID);
|
||||
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
|
||||
|
||||
/* the following macros actually implement addref, release and query interface for our component. */
|
||||
NS_IMPL_ISUPPORTS_INHERITED2(nsMsgMailboxParser, nsParseMailMessageState, nsIStreamListener, nsIDBChangeListener)
|
||||
NS_IMPL_ISUPPORTS_INHERITED3(nsMsgMailboxParser,
|
||||
nsParseMailMessageState,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIDBChangeListener)
|
||||
|
||||
// Whenever data arrives from the connection, core netlib notifices the protocol by calling
|
||||
// OnDataAvailable. We then read and process the incoming data from the input stream.
|
||||
|
||||
@ -1012,7 +1012,11 @@ mozTXTToHTMLConv::~mozTXTToHTMLConv()
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(mozTXTToHTMLConv, mozITXTToHTMLConv)
|
||||
NS_IMPL_ISUPPORTS4(mozTXTToHTMLConv,
|
||||
mozITXTToHTMLConv,
|
||||
nsIStreamConverter,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
PRInt32
|
||||
mozTXTToHTMLConv::CiteLevelTXT(const PRUnichar *line,
|
||||
|
||||
@ -50,7 +50,10 @@
|
||||
#include "nsComponentManagerUtils.h"
|
||||
|
||||
// nsISupports implementation
|
||||
NS_IMPL_ISUPPORTS2(nsHTTPCompressConv, nsIStreamConverter, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS3(nsHTTPCompressConv,
|
||||
nsIStreamConverter,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
// nsFTPDirListingConv methods
|
||||
nsHTTPCompressConv::nsHTTPCompressConv()
|
||||
|
||||
@ -9,7 +9,10 @@
|
||||
// TestConverter
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS3(TestConverter,
|
||||
nsIStreamConverter,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
TestConverter::TestConverter() {
|
||||
}
|
||||
|
||||
@ -116,7 +116,10 @@ public:
|
||||
nsresult aStatus) { return NS_OK; }
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS2(EndListener,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// EndListener END
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -82,7 +82,9 @@ InputTestConsumer::~InputTestConsumer()
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(InputTestConsumer, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS2(InputTestConsumer,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
NS_IMETHODIMP
|
||||
InputTestConsumer::OnStartRequest(nsIRequest *request, nsISupports* context)
|
||||
|
||||
@ -97,7 +97,9 @@ StreamToFile::StreamToFile(FILE* fp)
|
||||
mFile = fp;
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(StreamToFile, nsIStreamListener)
|
||||
NS_IMPL_ISUPPORTS2(StreamToFile,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
StreamToFile::~StreamToFile()
|
||||
{
|
||||
|
||||
@ -2504,7 +2504,9 @@ CPluginInputStream::~CPluginInputStream(void)
|
||||
NS_IF_RELEASE(mStreamInfo);
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(CPluginInputStream, nsIPluginInputStream)
|
||||
NS_IMPL_ISUPPORTS2(CPluginInputStream,
|
||||
nsIPluginInputStream,
|
||||
nsIInputStream)
|
||||
|
||||
NS_METHOD
|
||||
CPluginInputStream::Close(void)
|
||||
|
||||
@ -858,9 +858,10 @@ nsFaviconService::OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen,
|
||||
}
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS4(FaviconLoadListener,
|
||||
NS_IMPL_ISUPPORTS5(FaviconLoadListener,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIInterfaceRequestor,
|
||||
nsIChannelEventSink)
|
||||
|
||||
|
||||
@ -149,7 +149,10 @@ nsExceptionManager *nsExceptionService::firstThread = nsnull;
|
||||
PRInt32 nsExceptionService::totalInstances = 0;
|
||||
#endif
|
||||
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS2(nsExceptionService, nsIExceptionService, nsIObserver)
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsExceptionService,
|
||||
nsIExceptionService,
|
||||
nsIExceptionManager,
|
||||
nsIObserver)
|
||||
|
||||
nsExceptionService::nsExceptionService()
|
||||
: mProviders(4, PR_TRUE) /* small, thread-safe hashtable */
|
||||
|
||||
@ -916,6 +916,69 @@ NS_IMETHODIMP_(nsrefcnt) Class::Release(void) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i9) \
|
||||
NS_INTERFACE_TABLE_END
|
||||
|
||||
#define NS_INTERFACE_TABLE_INHERITED10(Class, i1, i2, i3, i4, i5, i6, i7, \
|
||||
i8, i9, i10) \
|
||||
NS_INTERFACE_TABLE_BEGIN \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i1) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i2) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i3) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i4) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i5) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i6) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i7) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i8) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i9) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i10) \
|
||||
NS_INTERFACE_TABLE_END
|
||||
|
||||
#define NS_INTERFACE_TABLE_INHERITED11(Class, i1, i2, i3, i4, i5, i6, i7, \
|
||||
i8, i9, i10, i11) \
|
||||
NS_INTERFACE_TABLE_BEGIN \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i1) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i2) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i3) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i4) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i5) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i6) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i7) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i8) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i9) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i10) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i11) \
|
||||
NS_INTERFACE_TABLE_END
|
||||
|
||||
#define NS_INTERFACE_TABLE_INHERITED12(Class, i1, i2, i3, i4, i5, i6, i7, \
|
||||
i8, i9, i10, i11, i12) \
|
||||
NS_INTERFACE_TABLE_BEGIN \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i1) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i2) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i3) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i4) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i5) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i6) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i7) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i8) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i9) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i10) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i11) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i12) \
|
||||
NS_INTERFACE_TABLE_END
|
||||
|
||||
#define NS_INTERFACE_TABLE_INHERITED10(Class, i1, i2, i3, i4, i5, i6, i7, \
|
||||
i8, i9, i10) \
|
||||
NS_INTERFACE_TABLE_BEGIN \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i1) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i2) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i3) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i4) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i5) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i6) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i7) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i8) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i9) \
|
||||
NS_INTERFACE_TABLE_ENTRY(Class, i10) \
|
||||
NS_INTERFACE_TABLE_END
|
||||
|
||||
#define NS_IMPL_QUERY_INTERFACE_INHERITED0(Class, Super) \
|
||||
NS_INTERFACE_TABLE_HEAD(Class) \
|
||||
NS_INTERFACE_TABLE_INHERITED0(Class) \
|
||||
|
||||
@ -247,9 +247,9 @@ RelatedLinksStreamListener::Init()
|
||||
|
||||
|
||||
// nsISupports interface
|
||||
NS_IMPL_ISUPPORTS1(RelatedLinksStreamListener, nsIStreamListener)
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS2(RelatedLinksStreamListener,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
// stream observer methods
|
||||
|
||||
|
||||
@ -122,6 +122,7 @@ NS_INTERFACE_MAP_BEGIN(nsXPInstallManager)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIXPInstallManager)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIObserver)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIProgressEventSink)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
|
||||
NS_INTERFACE_MAP_ENTRY(nsPICertNotification)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user