diff --git a/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp b/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp index 5b94793cfa7..293dfd1546b 100644 --- a/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp +++ b/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp @@ -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, diff --git a/mozilla/content/base/src/nsDOMParser.cpp b/mozilla/content/base/src/nsDOMParser.cpp index 63a7f3b41eb..42e9a467175 100644 --- a/mozilla/content/base/src/nsDOMParser.cpp +++ b/mozilla/content/base/src/nsDOMParser.cpp @@ -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) diff --git a/mozilla/content/base/src/nsGenConImageContent.cpp b/mozilla/content/base/src/nsGenConImageContent.cpp index 0880203d8e8..094ff280d15 100644 --- a/mozilla/content/base/src/nsGenConImageContent.cpp +++ b/mozilla/content/base/src/nsGenConImageContent.cpp @@ -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, diff --git a/mozilla/content/base/src/nsSyncLoadService.cpp b/mozilla/content/base/src/nsSyncLoadService.cpp index 936bbeccd0f..07425a694ff 100644 --- a/mozilla/content/base/src/nsSyncLoadService.cpp +++ b/mozilla/content/base/src/nsSyncLoadService.cpp @@ -154,8 +154,9 @@ nsSyncLoader::~nsSyncLoader() } } -NS_IMPL_ISUPPORTS4(nsSyncLoader, +NS_IMPL_ISUPPORTS5(nsSyncLoader, nsIDOMLoadListener, + nsIDOMEventListener, nsIChannelEventSink, nsIInterfaceRequestor, nsISupportsWeakReference) diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index 35e405e593b..992c5b83a72 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -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) diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 51a45dd0d31..091f91a2623 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -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) diff --git a/mozilla/content/html/content/src/nsHTMLObjectElement.cpp b/mozilla/content/html/content/src/nsHTMLObjectElement.cpp index a39b19c8bbb..c6567d79984 100644 --- a/mozilla/content/html/content/src/nsHTMLObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLObjectElement.cpp @@ -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) diff --git a/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp b/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp index 1d399dbe656..aac8751aa84 100644 --- a/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp @@ -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) diff --git a/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp b/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp index 0dcea674b5c..ef08733b0cb 100755 --- a/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp +++ b/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp @@ -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) diff --git a/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp b/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp index d95a19f5451..317b563aa1c 100644 --- a/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp +++ b/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp @@ -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 diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp index 57119d91356..ba9e31b43e7 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -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) diff --git a/mozilla/extensions/xforms/nsXFormsMessageElement.cpp b/mozilla/extensions/xforms/nsXFormsMessageElement.cpp index de1a17cae83..2746c5a3445 100644 --- a/mozilla/extensions/xforms/nsXFormsMessageElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsMessageElement.cpp @@ -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) diff --git a/mozilla/extensions/xforms/nsXFormsModelElement.cpp b/mozilla/extensions/xforms/nsXFormsModelElement.cpp index 9648f8169a5..dd717da79a0 100644 --- a/mozilla/extensions/xforms/nsXFormsModelElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsModelElement.cpp @@ -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) diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index b585fc40a1c..1486fbc72be 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -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; diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index b171c16039c..53e88729972 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -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) diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index a3e0309a0b7..953bb8e22df 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -252,6 +252,10 @@ nsIsIndexFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = static_cast(this); return NS_OK; } + if (aIID.Equals(NS_GET_IID(nsIDOMEventListener))) { + *aInstancePtr = static_cast(this); + return NS_OK; + } return nsAreaFrame::QueryInterface(aIID, aInstancePtr); } diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index ddebcb82a73..4faf8bcb9a2 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -602,7 +602,10 @@ private: }; // Implement our nsISupports methods -NS_IMPL_ISUPPORTS2(nsTextInputSelectionImpl, nsISelectionController, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl, + nsISelectionController, + nsISelectionDisplay, + nsISupportsWeakReference) // BEGIN nsTextInputSelectionImpl diff --git a/mozilla/layout/inspector/src/inDeepTreeWalker.cpp b/mozilla/layout/inspector/src/inDeepTreeWalker.cpp index eb9fa308a54..210fd83af0f 100644 --- a/mozilla/layout/inspector/src/inDeepTreeWalker.cpp +++ b/mozilla/layout/inspector/src/inDeepTreeWalker.cpp @@ -79,7 +79,9 @@ inDeepTreeWalker::~inDeepTreeWalker() } } -NS_IMPL_ISUPPORTS1(inDeepTreeWalker, inIDeepTreeWalker) +NS_IMPL_ISUPPORTS2(inDeepTreeWalker, + inIDeepTreeWalker, + nsIDOMTreeWalker) //////////////////////////////////////////////////// // inIDeepTreeWalker diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index 8348ef2ef43..99635e38558 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -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 diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index bb044f2fd27..7505af2fbc4 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -1145,4 +1145,6 @@ void nsSliderFrame::Notify(void) } } -NS_IMPL_ISUPPORTS1(nsSliderMediator, nsIDOMMouseListener) +NS_IMPL_ISUPPORTS2(nsSliderMediator, + nsIDOMMouseListener, + nsIDOMEventListener) diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index 9d1d07f25a6..4e63e499913 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -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() diff --git a/mozilla/layout/xul/base/src/nsXULPopupManager.cpp b/mozilla/layout/xul/base/src/nsXULPopupManager.cpp index e1a637292a4..927fe8197b6 100644 --- a/mozilla/layout/xul/base/src/nsXULPopupManager.cpp +++ b/mozilla/layout/xul/base/src/nsXULPopupManager.cpp @@ -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), diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index b427210564a..0fd730c5ffc 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -2680,7 +2680,11 @@ public: // // nsISupports // -NS_IMPL_ISUPPORTS3(nsDelAttachListener,nsIStreamListener,nsIUrlListener,nsIMsgCopyServiceListener) +NS_IMPL_ISUPPORTS4(nsDelAttachListener, + nsIStreamListener, + nsIRequestObserver, + nsIUrlListener, + nsIMsgCopyServiceListener) // // nsIRequestObserver diff --git a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp index 866d36a3dd2..13d9d1d1c84 100644 --- a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -785,7 +785,9 @@ protected: }; -NS_IMPL_ISUPPORTS1(nsMsgSaveAsListener, nsIStreamListener) +NS_IMPL_ISUPPORTS2(nsMsgSaveAsListener, + nsIStreamListener, + nsIRequestObserver) nsMsgSaveAsListener::nsMsgSaveAsListener(nsIFile *aFile, PRBool addDummyEnvelope) { diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 33c8d0680bb..6d2e7321577 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -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 //////////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp b/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp index a3dba8d6054..71859e89c9d 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp @@ -47,7 +47,9 @@ #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" -NS_IMPL_ISUPPORTS1(nsMsgComposeProgress, nsIMsgComposeProgress) +NS_IMPL_ISUPPORTS2(nsMsgComposeProgress, + nsIMsgComposeProgress, + nsIWebProgressListener) nsMsgComposeProgress::nsMsgComposeProgress() { diff --git a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp index 7cca28bd243..29ff5d3f9d8 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp @@ -881,7 +881,10 @@ public: char mLastBlockChars[3]; }; -NS_IMPL_ISUPPORTS2(nsMsgTemplateReplyHelper, nsIStreamListener, nsIUrlListener) +NS_IMPL_ISUPPORTS3(nsMsgTemplateReplyHelper, + nsIStreamListener, + nsIRequestObserver, + nsIUrlListener) nsMsgTemplateReplyHelper::nsMsgTemplateReplyHelper() { diff --git a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp index 21a546160d4..ecf29eaec21 100644 --- a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp @@ -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() { diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.cpp b/mozilla/mailnews/compose/src/nsURLFetcher.cpp index e8b95a386eb..689c2d4b4ba 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.cpp +++ b/mozilla/mailnews/compose/src/nsURLFetcher.cpp @@ -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) /* diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index f0f4b9b61e6..a0709b730bd 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -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. diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp index 4427313d1aa..e574d3c3d3f 100644 --- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -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, diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index 29bdd5d9ab2..c873b482bcf 100644 --- a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp @@ -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() diff --git a/mozilla/netwerk/streamconv/test/Converters.cpp b/mozilla/netwerk/streamconv/test/Converters.cpp index 2fcf8c029c5..ca6570bd300 100644 --- a/mozilla/netwerk/streamconv/test/Converters.cpp +++ b/mozilla/netwerk/streamconv/test/Converters.cpp @@ -9,7 +9,10 @@ // TestConverter ////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener) +NS_IMPL_ISUPPORTS3(TestConverter, + nsIStreamConverter, + nsIStreamListener, + nsIRequestObserver) TestConverter::TestConverter() { } diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp index 1ced7e806ed..e9725e31a73 100644 --- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp +++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp @@ -116,7 +116,10 @@ public: nsresult aStatus) { return NS_OK; } }; -NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener) +NS_IMPL_ISUPPORTS2(EndListener, + nsIStreamListener, + nsIRequestObserver) + //////////////////////////////////////////////////////////////////////// // EndListener END //////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/test/TestUpload.cpp b/mozilla/netwerk/test/TestUpload.cpp index b2542ce357c..7e21c12fc96 100644 --- a/mozilla/netwerk/test/TestUpload.cpp +++ b/mozilla/netwerk/test/TestUpload.cpp @@ -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) diff --git a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp index 2472a2818bb..1c3fda05ac4 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -97,7 +97,9 @@ StreamToFile::StreamToFile(FILE* fp) mFile = fp; } -NS_IMPL_ISUPPORTS1(StreamToFile, nsIStreamListener) +NS_IMPL_ISUPPORTS2(StreamToFile, + nsIStreamListener, + nsIRequestObserver) StreamToFile::~StreamToFile() { diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp index f11728ee8a1..cbfe5461552 100644 --- a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp +++ b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp @@ -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) diff --git a/mozilla/toolkit/components/places/src/nsFaviconService.cpp b/mozilla/toolkit/components/places/src/nsFaviconService.cpp index 91ee438c4b0..98c0e083f82 100644 --- a/mozilla/toolkit/components/places/src/nsFaviconService.cpp +++ b/mozilla/toolkit/components/places/src/nsFaviconService.cpp @@ -858,9 +858,10 @@ nsFaviconService::OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen, } -NS_IMPL_ISUPPORTS4(FaviconLoadListener, +NS_IMPL_ISUPPORTS5(FaviconLoadListener, nsIRequestObserver, nsIStreamListener, + nsIRequestObserver, nsIInterfaceRequestor, nsIChannelEventSink) diff --git a/mozilla/xpcom/base/nsExceptionService.cpp b/mozilla/xpcom/base/nsExceptionService.cpp index 14c77ba94e4..3cd37d985a4 100644 --- a/mozilla/xpcom/base/nsExceptionService.cpp +++ b/mozilla/xpcom/base/nsExceptionService.cpp @@ -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 */ diff --git a/mozilla/xpcom/glue/nsISupportsImpl.h b/mozilla/xpcom/glue/nsISupportsImpl.h index a9e151d3431..3b8aa00a841 100644 --- a/mozilla/xpcom/glue/nsISupportsImpl.h +++ b/mozilla/xpcom/glue/nsISupportsImpl.h @@ -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) \ diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index dbbb46e2822..2e17f38544e 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -247,9 +247,9 @@ RelatedLinksStreamListener::Init() // nsISupports interface -NS_IMPL_ISUPPORTS1(RelatedLinksStreamListener, nsIStreamListener) - - +NS_IMPL_ISUPPORTS2(RelatedLinksStreamListener, + nsIStreamListener, + nsIRequestObserver) // stream observer methods diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index aeee4e0ff0e..ae183cf9845 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -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)