зеркало из https://github.com/mozilla/gecko-dev.git
reverting, wrong patch, missing AMBIGUOUS
This commit is contained in:
Родитель
a9fd7c94b3
Коммит
7f880e43ef
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -155,9 +155,8 @@ nsSyncLoader::~nsSyncLoader()
|
|||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS5(nsSyncLoader,
|
||||
NS_IMPL_ISUPPORTS4(nsSyncLoader,
|
||||
nsIDOMLoadListener,
|
||||
nsIDOMEventListener,
|
||||
nsIChannelEventSink,
|
||||
nsIInterfaceRequestor,
|
||||
nsISupportsWeakReference)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -252,10 +252,6 @@ 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,10 +602,7 @@ private:
|
|||
};
|
||||
|
||||
// Implement our nsISupports methods
|
||||
NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl,
|
||||
nsISelectionController,
|
||||
nsISelectionDisplay,
|
||||
nsISupportsWeakReference)
|
||||
NS_IMPL_ISUPPORTS2(nsTextInputSelectionImpl, nsISelectionController, nsISupportsWeakReference)
|
||||
|
||||
|
||||
// BEGIN nsTextInputSelectionImpl
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -79,9 +79,7 @@ inDeepTreeWalker::~inDeepTreeWalker()
|
|||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS2(inDeepTreeWalker,
|
||||
inIDeepTreeWalker,
|
||||
nsIDOMTreeWalker)
|
||||
NS_IMPL_ISUPPORTS1(inDeepTreeWalker, inIDeepTreeWalker)
|
||||
|
||||
////////////////////////////////////////////////////
|
||||
// inIDeepTreeWalker
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -89,6 +89,10 @@ nsTableRowGroupFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
|
|||
*aInstancePtr = static_cast<nsILineIteratorNavigator*>(this);
|
||||
return NS_OK;
|
||||
}
|
||||
if (aIID.Equals(NS_GET_IID(nsILineIterator))) {
|
||||
*aInstancePtr = static_cast<nsILineIterator*>(this);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1145,6 +1145,4 @@ void nsSliderFrame::Notify(void)
|
|||
}
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS2(nsSliderMediator,
|
||||
nsIDOMMouseListener,
|
||||
nsIDOMEventListener)
|
||||
NS_IMPL_ISUPPORTS1(nsSliderMediator, nsIDOMMouseListener)
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -9,10 +9,7 @@
|
|||
// TestConverter
|
||||
//////////////////////////////////////////////////
|
||||
|
||||
NS_IMPL_ISUPPORTS3(TestConverter,
|
||||
nsIStreamConverter,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener)
|
||||
|
||||
TestConverter::TestConverter() {
|
||||
}
|
||||
|
|
|
@ -116,10 +116,7 @@ public:
|
|||
nsresult aStatus) { return NS_OK; }
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS2(EndListener,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
|
||||
NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener)
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// EndListener END
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -97,9 +97,7 @@ StreamToFile::StreamToFile(FILE* fp)
|
|||
mFile = fp;
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS2(StreamToFile,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
NS_IMPL_ISUPPORTS1(StreamToFile, nsIStreamListener)
|
||||
|
||||
StreamToFile::~StreamToFile()
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -858,10 +858,9 @@ nsFaviconService::OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen,
|
|||
}
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS5(FaviconLoadListener,
|
||||
NS_IMPL_ISUPPORTS4(FaviconLoadListener,
|
||||
nsIRequestObserver,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver,
|
||||
nsIInterfaceRequestor,
|
||||
nsIChannelEventSink)
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -247,9 +247,9 @@ RelatedLinksStreamListener::Init()
|
|||
|
||||
|
||||
// nsISupports interface
|
||||
NS_IMPL_ISUPPORTS2(RelatedLinksStreamListener,
|
||||
nsIStreamListener,
|
||||
nsIRequestObserver)
|
||||
NS_IMPL_ISUPPORTS1(RelatedLinksStreamListener, nsIStreamListener)
|
||||
|
||||
|
||||
|
||||
// stream observer methods
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче