From cb247b3213ce43e154d0f24431984b3d66825d9f Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Wed, 19 Mar 2008 21:55:28 +0000 Subject: [PATCH] reverting, wrong patch, missing AMBIGUOUS git-svn-id: svn://10.0.0.236/trunk@248210 18797224-902f-48f8-a5cc-f745e15eee43 --- .../components/feeds/src/nsFeedSniffer.cpp | 5 +---- mozilla/content/base/src/nsDOMParser.cpp | 1 - .../content/base/src/nsGenConImageContent.cpp | 7 ++----- .../content/base/src/nsSyncLoadService.cpp | 3 +-- mozilla/content/base/src/nsXMLHttpRequest.cpp | 1 + .../html/content/src/nsHTMLImageElement.cpp | 3 +-- .../html/content/src/nsHTMLInputElement.cpp | 21 +++++++++---------- .../html/content/src/nsHTMLObjectElement.cpp | 21 +++++++++---------- .../content/src/nsHTMLSharedObjectElement.cpp | 5 ++--- .../document/src/nsLoadSaveContentSink.cpp | 1 - .../browser/webBrowser/nsWebBrowser.cpp | 1 - .../xforms/nsXFormsMessageElement.cpp | 1 - .../xforms/nsXFormsModelElement.cpp | 1 - .../tests/components/xpctest_child.cpp | 5 +---- .../layout/forms/nsComboboxControlFrame.cpp | 4 +--- mozilla/layout/forms/nsFileControlFrame.cpp | 4 +--- mozilla/layout/forms/nsIsIndexFrame.cpp | 4 ---- mozilla/layout/forms/nsTextControlFrame.cpp | 5 +---- mozilla/layout/generic/nsObjectFrame.cpp | 5 ++++- .../layout/inspector/src/inDeepTreeWalker.cpp | 4 +--- .../mathml/base/src/nsMathMLmactionFrame.cpp | 5 ++++- .../layout/tables/nsTableRowGroupFrame.cpp | 4 ++++ .../layout/xul/base/src/nsMenuBarListener.cpp | 6 +----- mozilla/layout/xul/base/src/nsSliderFrame.cpp | 4 +--- .../layout/xul/base/src/nsXULPopupManager.cpp | 8 ++----- mozilla/mailnews/base/src/nsMessenger.cpp | 6 +----- .../mailnews/base/util/nsMsgMailNewsUrl.cpp | 4 +--- mozilla/mailnews/compose/src/nsMsgCompose.cpp | 6 +----- .../compose/src/nsMsgComposeProgress.cpp | 4 +--- .../compose/src/nsMsgComposeService.cpp | 5 +---- .../mailnews/compose/src/nsMsgSendLater.cpp | 5 +---- mozilla/mailnews/compose/src/nsURLFetcher.cpp | 9 +------- mozilla/mailnews/local/src/nsParseMailbox.cpp | 6 +----- .../plugin/base/src/nsPluginHostImpl.cpp | 13 +++++++++--- .../converters/mozTXTToHTMLConv.cpp | 6 +----- .../converters/nsHTTPCompressConv.cpp | 5 +---- .../netwerk/streamconv/test/Converters.cpp | 5 +---- .../streamconv/test/TestStreamConv.cpp | 5 +---- mozilla/netwerk/test/TestUpload.cpp | 4 +--- .../htmlparser/tests/grabpage/grabpage.cpp | 4 +--- .../oji/MRJ/plugin/Source/BackwardAdapter.cpp | 4 +--- .../places/src/nsFaviconService.cpp | 3 +-- mozilla/xpcom/base/nsExceptionService.cpp | 5 +---- mozilla/xpcom/glue/nsISupportsImpl.h | 15 ------------- .../related/src/nsRelatedLinksHandler.cpp | 6 +++--- mozilla/xpinstall/src/nsXPInstallManager.cpp | 1 - 46 files changed, 79 insertions(+), 171 deletions(-) diff --git a/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp b/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp index 293dfd1546b..5b94793cfa7 100644 --- a/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp +++ b/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp @@ -69,10 +69,7 @@ #define MAX_BYTES 512 -NS_IMPL_ISUPPORTS3(nsFeedSniffer, - nsIContentSniffer, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS2(nsFeedSniffer, nsIContentSniffer, nsIStreamListener) nsresult nsFeedSniffer::ConvertEncodedData(nsIRequest* request, diff --git a/mozilla/content/base/src/nsDOMParser.cpp b/mozilla/content/base/src/nsDOMParser.cpp index dbf72c0baf1..81a418a9f5a 100644 --- a/mozilla/content/base/src/nsDOMParser.cpp +++ b/mozilla/content/base/src/nsDOMParser.cpp @@ -123,7 +123,6 @@ 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 d8b7c3d6ac5..0880203d8e8 100644 --- a/mozilla/content/base/src/nsGenConImageContent.cpp +++ b/mozilla/content/base/src/nsGenConImageContent.cpp @@ -73,11 +73,8 @@ public: NS_DECL_ISUPPORTS_INHERITED }; -NS_IMPL_ISUPPORTS_INHERITED3(nsGenConImageContent, - nsXMLElement, - nsIImageLoadingContent, - imgIContainerObserver, - imgIDecoderObserver) +NS_IMPL_ISUPPORTS_INHERITED2(nsGenConImageContent, nsXMLElement, + nsIImageLoadingContent, 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 6e85de6a61e..5a5172f7392 100644 --- a/mozilla/content/base/src/nsSyncLoadService.cpp +++ b/mozilla/content/base/src/nsSyncLoadService.cpp @@ -155,9 +155,8 @@ nsSyncLoader::~nsSyncLoader() } } -NS_IMPL_ISUPPORTS5(nsSyncLoader, +NS_IMPL_ISUPPORTS4(nsSyncLoader, nsIDOMLoadListener, - nsIDOMEventListener, nsIChannelEventSink, nsIInterfaceRequestor, nsISupportsWeakReference) diff --git a/mozilla/content/base/src/nsXMLHttpRequest.cpp b/mozilla/content/base/src/nsXMLHttpRequest.cpp index b84f05ba4c6..914305ddd92 100644 --- a/mozilla/content/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp @@ -724,6 +724,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIJSXMLHttpRequest) NS_INTERFACE_MAP_ENTRY(nsIDOMLoadListener) + NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index 73df61a2d94..265cd1342c7 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -192,11 +192,10 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLImageElement, nsGenericElement) // QueryInterface implementation for nsHTMLImageElement NS_HTML_CONTENT_INTERFACE_TABLE_HEAD(nsHTMLImageElement, nsGenericHTMLElement) - NS_INTERFACE_TABLE_INHERITED6(nsHTMLImageElement, + NS_INTERFACE_TABLE_INHERITED5(nsHTMLImageElement, nsIDOMHTMLImageElement, nsIDOMNSHTMLImageElement, nsIJSNativeInitializer, - imgIContainerObserver, imgIDecoderObserver, nsIImageLoadingContent) 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 c911db67b30..51a45dd0d31 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -410,17 +410,16 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLInputElement, nsGenericElement) // QueryInterface implementation for nsHTMLInputElement NS_HTML_CONTENT_CC_INTERFACE_TABLE_HEAD(nsHTMLInputElement, nsGenericHTMLFormElement) - NS_INTERFACE_TABLE_INHERITED10(nsHTMLInputElement, - nsIDOMHTMLInputElement, - nsIDOMNSHTMLInputElement, - nsITextControlElement, - nsIFileControlElement, - nsIRadioControlElement, - nsIPhonetic, - imgIContainerObserver, - imgIDecoderObserver, - nsIImageLoadingContent, - nsIDOMNSEditableElement) + NS_INTERFACE_TABLE_INHERITED9(nsHTMLInputElement, + nsIDOMHTMLInputElement, + nsIDOMNSHTMLInputElement, + nsITextControlElement, + nsIFileControlElement, + nsIRadioControlElement, + nsIPhonetic, + imgIDecoderObserver, + nsIImageLoadingContent, + 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 ddc33d20112..a39b19c8bbb 100644 --- a/mozilla/content/html/content/src/nsHTMLObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLObjectElement.cpp @@ -168,17 +168,16 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLObjectElement, nsGenericElement) NS_HTML_CONTENT_CC_INTERFACE_TABLE_HEAD(nsHTMLObjectElement, nsGenericHTMLFormElement) - NS_INTERFACE_TABLE_INHERITED10(nsHTMLObjectElement, - nsIDOMHTMLObjectElement, - nsIRequestObserver, - nsIStreamListener, - nsIFrameLoaderOwner, - imgIContainerObserver, - imgIDecoderObserver, - nsIObjectLoadingContent, - nsIImageLoadingContent, - nsIInterfaceRequestor, - nsIChannelEventSink) + NS_INTERFACE_TABLE_INHERITED9(nsHTMLObjectElement, + nsIDOMHTMLObjectElement, + imgIDecoderObserver, + nsIRequestObserver, + nsIStreamListener, + nsIFrameLoaderOwner, + nsIObjectLoadingContent, + nsIImageLoadingContent, + 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 aac8751aa84..1d399dbe656 100644 --- a/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp @@ -213,13 +213,12 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLSharedObjectElement, nsGenericElement) NS_HTML_CONTENT_CC_INTERFACE_TABLE_AMBIGUOUS_HEAD(nsHTMLSharedObjectElement, nsGenericHTMLElement, nsIDOMHTMLAppletElement) - NS_INTERFACE_TABLE_INHERITED9(nsHTMLSharedObjectElement, + NS_INTERFACE_TABLE_INHERITED8(nsHTMLSharedObjectElement, + imgIDecoderObserver, nsIRequestObserver, nsIStreamListener, nsIFrameLoaderOwner, - imgIContainerObserver, nsIObjectLoadingContent, - imgIDecoderObserver, nsIImageLoadingContent, nsIInterfaceRequestor, nsIChannelEventSink) diff --git a/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp b/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp index 317b563aa1c..d95a19f5451 100644 --- a/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp +++ b/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp @@ -86,7 +86,6 @@ 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 07c984788f6..acbab66c390 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -173,7 +173,6 @@ 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 2746c5a3445..de1a17cae83 100644 --- a/mozilla/extensions/xforms/nsXFormsMessageElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsMessageElement.cpp @@ -229,7 +229,6 @@ 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 dd717da79a0..9648f8169a5 100644 --- a/mozilla/extensions/xforms/nsXFormsModelElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsModelElement.cpp @@ -669,7 +669,6 @@ 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/js/src/xpconnect/tests/components/xpctest_child.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp index a4d5ef154ee..035c24285dc 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp @@ -80,10 +80,7 @@ NS_IMETHODIMP xpctestOther::Method3(PRInt16 i, PRInt16 j, PRInt16 k) return NS_OK; } -NS_IMPL_ISUPPORTS_INHERITED2(xpctestChild, - xpctestOther, - nsIXPCTestChild, - nsIXPCTestParent) +NS_IMPL_ISUPPORTS_INHERITED1(xpctestChild, xpctestOther, nsIXPCTestChild) xpctestChild::xpctestChild() { diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 1486fbc72be..b585fc40a1c 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -153,9 +153,7 @@ class nsComboButtonListener: public nsIDOMMouseListener nsComboboxControlFrame* mComboBox; }; -NS_IMPL_ISUPPORTS2(nsComboButtonListener, - nsIDOMMouseListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS1(nsComboButtonListener, nsIDOMMouseListener) // 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 53e88729972..b171c16039c 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -612,9 +612,7 @@ NS_IMETHODIMP nsFileControlFrame::GetAccessible(nsIAccessible** aAccessible) //////////////////////////////////////////////////////////// // Mouse listener implementation -NS_IMPL_ISUPPORTS2(nsFileControlFrame::MouseListener, - nsIDOMMouseListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS1(nsFileControlFrame::MouseListener, nsIDOMMouseListener) NS_IMETHODIMP nsFileControlFrame::MouseListener::MouseClick(nsIDOMEvent* aMouseEvent) diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index 953bb8e22df..a3e0309a0b7 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -252,10 +252,6 @@ 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 894e6cda68c..fafafb139a7 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -602,10 +602,7 @@ private: }; // Implement our nsISupports methods -NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl, - nsISelectionController, - nsISelectionDisplay, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS2(nsTextInputSelectionImpl, nsISelectionController, nsISupportsWeakReference) // BEGIN nsTextInputSelectionImpl diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 2b78d23ea92..0a2f62a69e3 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -1898,7 +1898,10 @@ nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener() { } -NS_IMPL_ISUPPORTS2(nsPluginDOMContextMenuListener, nsIDOMContextMenuListener, nsIEventListener) +NS_IMPL_ISUPPORTS3(nsPluginDOMContextMenuListener, + nsIDOMContextMenuListener, + nsIDOMEventListener, + nsIEventListener) NS_IMETHODIMP nsPluginDOMContextMenuListener::ContextMenu(nsIDOMEvent* aContextMenuEvent) diff --git a/mozilla/layout/inspector/src/inDeepTreeWalker.cpp b/mozilla/layout/inspector/src/inDeepTreeWalker.cpp index 210fd83af0f..eb9fa308a54 100644 --- a/mozilla/layout/inspector/src/inDeepTreeWalker.cpp +++ b/mozilla/layout/inspector/src/inDeepTreeWalker.cpp @@ -79,9 +79,7 @@ inDeepTreeWalker::~inDeepTreeWalker() } } -NS_IMPL_ISUPPORTS2(inDeepTreeWalker, - inIDeepTreeWalker, - nsIDOMTreeWalker) +NS_IMPL_ISUPPORTS1(inDeepTreeWalker, inIDeepTreeWalker) //////////////////////////////////////////////////// // inIDeepTreeWalker diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp index c212ce0f543..a65b58d5bb6 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp @@ -76,7 +76,10 @@ NS_IMPL_ADDREF_INHERITED(nsMathMLmactionFrame, nsMathMLContainerFrame) NS_IMPL_RELEASE_INHERITED(nsMathMLmactionFrame, nsMathMLContainerFrame) -NS_IMPL_QUERY_INTERFACE_INHERITED1(nsMathMLmactionFrame, nsMathMLContainerFrame, nsIDOMMouseListener) +NS_IMPL_QUERY_INTERFACE_INHERITED2(nsMathMLmactionFrame, + nsMathMLContainerFrame, + nsIDOMMouseListener, + nsIDOMEventListener) nsIFrame* NS_NewMathMLmactionFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index 20ece5a5bec..bffe6006ea8 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -89,6 +89,10 @@ nsTableRowGroupFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = static_cast(this); return NS_OK; } + if (aIID.Equals(NS_GET_IID(nsILineIterator))) { + *aInstancePtr = static_cast(this); + return NS_OK; + } return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); } diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index 6090709a873..8348ef2ef43 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -68,11 +68,7 @@ NS_IMPL_ADDREF(nsMenuBarListener) NS_IMPL_RELEASE(nsMenuBarListener) -NS_IMPL_QUERY_INTERFACE4(nsMenuBarListener, - nsIDOMKeyListener, - nsIDOMFocusListener, - nsIDOMEventListener, - nsIDOMMouseListener) +NS_IMPL_QUERY_INTERFACE3(nsMenuBarListener, nsIDOMKeyListener, nsIDOMFocusListener, nsIDOMMouseListener) #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 7505af2fbc4..bb044f2fd27 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -1145,6 +1145,4 @@ void nsSliderFrame::Notify(void) } } -NS_IMPL_ISUPPORTS2(nsSliderMediator, - nsIDOMMouseListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS1(nsSliderMediator, nsIDOMMouseListener) diff --git a/mozilla/layout/xul/base/src/nsXULPopupManager.cpp b/mozilla/layout/xul/base/src/nsXULPopupManager.cpp index 6a6f8348af0..27a667d9e8c 100644 --- a/mozilla/layout/xul/base/src/nsXULPopupManager.cpp +++ b/mozilla/layout/xul/base/src/nsXULPopupManager.cpp @@ -123,12 +123,8 @@ void nsMenuChainItem::Detach(nsMenuChainItem** aRoot) } } -NS_IMPL_ISUPPORTS5(nsXULPopupManager, - nsIDOMKeyListener, - nsIDOMEventListener, - nsIMenuRollup, - nsIRollupListener, - nsITimerCallback) +NS_IMPL_ISUPPORTS4(nsXULPopupManager, nsIDOMKeyListener, + nsIMenuRollup, nsIRollupListener, nsITimerCallback) nsXULPopupManager::nsXULPopupManager() : mRangeOffset(0), diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index 0fd730c5ffc..b427210564a 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -2680,11 +2680,7 @@ public: // // nsISupports // -NS_IMPL_ISUPPORTS4(nsDelAttachListener, - nsIStreamListener, - nsIRequestObserver, - nsIUrlListener, - nsIMsgCopyServiceListener) +NS_IMPL_ISUPPORTS3(nsDelAttachListener,nsIStreamListener,nsIUrlListener,nsIMsgCopyServiceListener) // // nsIRequestObserver diff --git a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp index 13d9d1d1c84..866d36a3dd2 100644 --- a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -785,9 +785,7 @@ protected: }; -NS_IMPL_ISUPPORTS2(nsMsgSaveAsListener, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS1(nsMsgSaveAsListener, nsIStreamListener) nsMsgSaveAsListener::nsMsgSaveAsListener(nsIFile *aFile, PRBool addDummyEnvelope) { diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index abf2c0789a2..7ca8440cbe6 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -2792,11 +2792,7 @@ QuotingOutputStreamListener::InsertToCompose(nsIEditor *aEditor, return NS_OK; } -NS_IMPL_ISUPPORTS3(QuotingOutputStreamListener, - nsIMsgQuotingOutputStreamListener, - nsIRequestObserver, - nsIStreamListener) - +NS_IMPL_ISUPPORTS2(QuotingOutputStreamListener, nsIMsgQuotingOutputStreamListener, nsIStreamListener) //////////////////////////////////////////////////////////////////////////////////// // END OF QUOTING LISTENER //////////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp b/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp index 71859e89c9d..a3dba8d6054 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp @@ -47,9 +47,7 @@ #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" -NS_IMPL_ISUPPORTS2(nsMsgComposeProgress, - nsIMsgComposeProgress, - nsIWebProgressListener) +NS_IMPL_ISUPPORTS1(nsMsgComposeProgress, nsIMsgComposeProgress) nsMsgComposeProgress::nsMsgComposeProgress() { diff --git a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp index 29ff5d3f9d8..7cca28bd243 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp @@ -881,10 +881,7 @@ public: char mLastBlockChars[3]; }; -NS_IMPL_ISUPPORTS3(nsMsgTemplateReplyHelper, - nsIStreamListener, - nsIRequestObserver, - nsIUrlListener) +NS_IMPL_ISUPPORTS2(nsMsgTemplateReplyHelper, nsIStreamListener, nsIUrlListener) nsMsgTemplateReplyHelper::nsMsgTemplateReplyHelper() { diff --git a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp index ecf29eaec21..21a546160d4 100644 --- a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp @@ -72,10 +72,7 @@ #include "nsMsgMimeCID.h" #include "nsComposeStrings.h" -NS_IMPL_ISUPPORTS3(nsMsgSendLater, - nsIMsgSendLater, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS2(nsMsgSendLater, nsIMsgSendLater, nsIStreamListener) nsMsgSendLater::nsMsgSendLater() { diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.cpp b/mozilla/mailnews/compose/src/nsURLFetcher.cpp index 689c2d4b4ba..e8b95a386eb 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.cpp +++ b/mozilla/mailnews/compose/src/nsURLFetcher.cpp @@ -61,14 +61,7 @@ #include "nsIStreamConverterService.h" #include "nsIMsgProgress.h" -NS_IMPL_ISUPPORTS7(nsURLFetcher, - nsIURLFetcher, - nsIStreamListener, - nsIRequestObserver, - nsIURIContentListener, - nsIInterfaceRequestor, - nsIWebProgressListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS6(nsURLFetcher, nsIURLFetcher, nsIStreamListener, nsIURIContentListener, nsIInterfaceRequestor, nsIWebProgressListener, nsISupportsWeakReference) /* diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index 84429cf418c..d5f77a093ff 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -95,11 +95,7 @@ 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_INHERITED3(nsMsgMailboxParser, - nsParseMailMessageState, - nsIStreamListener, - nsIRequestObserver, - nsIDBChangeListener) +NS_IMPL_ISUPPORTS_INHERITED2(nsMsgMailboxParser, nsParseMailMessageState, nsIStreamListener, 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/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index dc0ec8cb501..f39cdce9c53 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -1652,7 +1652,10 @@ nsPluginCacheListener::~nsPluginCacheListener() //////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsPluginCacheListener, nsIStreamListener) +NS_IMPL_ISUPPORTS2(nsPluginCacheListener, + nsIStreamListener, + nsIRequestObserver) + //////////////////////////////////////////////////////////////////////// NS_IMETHODIMP nsPluginCacheListener::OnStartRequest(nsIRequest *request, nsISupports* ctxt) @@ -2707,10 +2710,11 @@ nsPluginHostImpl::~nsPluginHostImpl() } //////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS8(nsPluginHostImpl, +NS_IMPL_ISUPPORTS9(nsPluginHostImpl, nsIPluginManager, nsIPluginManager2, nsIPluginHost, + nsIFactory, nsIFileUtilities, nsICookieStorage, nsIObserver, @@ -7078,7 +7082,10 @@ nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request, } ////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsPluginByteRangeStreamListener, nsIStreamListener) +NS_IMPL_ISUPPORTS2(nsPluginByteRangeStreamListener, + nsIStreamListener, + nsIRequestObserver) + nsPluginByteRangeStreamListener::nsPluginByteRangeStreamListener(nsIWeakReference* aWeakPtr) { mWeakPtrPluginStreamListenerPeer = aWeakPtr; diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp index e574d3c3d3f..4427313d1aa 100644 --- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -1012,11 +1012,7 @@ mozTXTToHTMLConv::~mozTXTToHTMLConv() { } -NS_IMPL_ISUPPORTS4(mozTXTToHTMLConv, - mozITXTToHTMLConv, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS1(mozTXTToHTMLConv, mozITXTToHTMLConv) PRInt32 mozTXTToHTMLConv::CiteLevelTXT(const PRUnichar *line, diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index c873b482bcf..29bdd5d9ab2 100644 --- a/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp @@ -50,10 +50,7 @@ #include "nsComponentManagerUtils.h" // nsISupports implementation -NS_IMPL_ISUPPORTS3(nsHTTPCompressConv, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS2(nsHTTPCompressConv, nsIStreamConverter, nsIStreamListener) // nsFTPDirListingConv methods nsHTTPCompressConv::nsHTTPCompressConv() diff --git a/mozilla/netwerk/streamconv/test/Converters.cpp b/mozilla/netwerk/streamconv/test/Converters.cpp index ca6570bd300..2fcf8c029c5 100644 --- a/mozilla/netwerk/streamconv/test/Converters.cpp +++ b/mozilla/netwerk/streamconv/test/Converters.cpp @@ -9,10 +9,7 @@ // TestConverter ////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS3(TestConverter, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener) TestConverter::TestConverter() { } diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp index e9725e31a73..1ced7e806ed 100644 --- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp +++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp @@ -116,10 +116,7 @@ public: nsresult aStatus) { return NS_OK; } }; -NS_IMPL_ISUPPORTS2(EndListener, - nsIStreamListener, - nsIRequestObserver) - +NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener) //////////////////////////////////////////////////////////////////////// // EndListener END //////////////////////////////////////////////////////////////////////// diff --git a/mozilla/netwerk/test/TestUpload.cpp b/mozilla/netwerk/test/TestUpload.cpp index 7e21c12fc96..b2542ce357c 100644 --- a/mozilla/netwerk/test/TestUpload.cpp +++ b/mozilla/netwerk/test/TestUpload.cpp @@ -82,9 +82,7 @@ InputTestConsumer::~InputTestConsumer() { } -NS_IMPL_ISUPPORTS2(InputTestConsumer, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS1(InputTestConsumer, nsIStreamListener) 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 1c3fda05ac4..2472a2818bb 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -97,9 +97,7 @@ StreamToFile::StreamToFile(FILE* fp) mFile = fp; } -NS_IMPL_ISUPPORTS2(StreamToFile, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS1(StreamToFile, nsIStreamListener) StreamToFile::~StreamToFile() { diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp index cbfe5461552..f11728ee8a1 100644 --- a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp +++ b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp @@ -2504,9 +2504,7 @@ CPluginInputStream::~CPluginInputStream(void) NS_IF_RELEASE(mStreamInfo); } -NS_IMPL_ISUPPORTS2(CPluginInputStream, - nsIPluginInputStream, - nsIInputStream) +NS_IMPL_ISUPPORTS1(CPluginInputStream, nsIPluginInputStream) NS_METHOD CPluginInputStream::Close(void) diff --git a/mozilla/toolkit/components/places/src/nsFaviconService.cpp b/mozilla/toolkit/components/places/src/nsFaviconService.cpp index 98c0e083f82..91ee438c4b0 100644 --- a/mozilla/toolkit/components/places/src/nsFaviconService.cpp +++ b/mozilla/toolkit/components/places/src/nsFaviconService.cpp @@ -858,10 +858,9 @@ nsFaviconService::OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen, } -NS_IMPL_ISUPPORTS5(FaviconLoadListener, +NS_IMPL_ISUPPORTS4(FaviconLoadListener, nsIRequestObserver, nsIStreamListener, - nsIRequestObserver, nsIInterfaceRequestor, nsIChannelEventSink) diff --git a/mozilla/xpcom/base/nsExceptionService.cpp b/mozilla/xpcom/base/nsExceptionService.cpp index 3cd37d985a4..14c77ba94e4 100644 --- a/mozilla/xpcom/base/nsExceptionService.cpp +++ b/mozilla/xpcom/base/nsExceptionService.cpp @@ -149,10 +149,7 @@ nsExceptionManager *nsExceptionService::firstThread = nsnull; PRInt32 nsExceptionService::totalInstances = 0; #endif -NS_IMPL_THREADSAFE_ISUPPORTS3(nsExceptionService, - nsIExceptionService, - nsIExceptionManager, - nsIObserver) +NS_IMPL_THREADSAFE_ISUPPORTS2(nsExceptionService, nsIExceptionService, 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 0a8a30fbf62..a9e151d3431 100644 --- a/mozilla/xpcom/glue/nsISupportsImpl.h +++ b/mozilla/xpcom/glue/nsISupportsImpl.h @@ -916,21 +916,6 @@ 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_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 2e17f38544e..dbbb46e2822 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_ISUPPORTS2(RelatedLinksStreamListener, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS1(RelatedLinksStreamListener, nsIStreamListener) + + // stream observer methods diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index ae183cf9845..aeee4e0ff0e 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -122,7 +122,6 @@ 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)