Fixing asymmetry between what timeless landed for bug 394114 and what he backed out.

This commit is contained in:
dbaron@dbaron.org 2008-03-19 15:05:04 -07:00
parent 7f880e43ef
commit 9c126b98d3
5 changed files with 5 additions and 23 deletions

View File

@ -724,7 +724,6 @@ 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)

View File

@ -1898,10 +1898,7 @@ nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener()
{
}
NS_IMPL_ISUPPORTS3(nsPluginDOMContextMenuListener,
nsIDOMContextMenuListener,
nsIDOMEventListener,
nsIEventListener)
NS_IMPL_ISUPPORTS2(nsPluginDOMContextMenuListener, nsIDOMContextMenuListener, nsIEventListener)
NS_IMETHODIMP
nsPluginDOMContextMenuListener::ContextMenu(nsIDOMEvent* aContextMenuEvent)

View File

@ -76,10 +76,7 @@
NS_IMPL_ADDREF_INHERITED(nsMathMLmactionFrame, nsMathMLContainerFrame)
NS_IMPL_RELEASE_INHERITED(nsMathMLmactionFrame, nsMathMLContainerFrame)
NS_IMPL_QUERY_INTERFACE_INHERITED2(nsMathMLmactionFrame,
nsMathMLContainerFrame,
nsIDOMMouseListener,
nsIDOMEventListener)
NS_IMPL_QUERY_INTERFACE_INHERITED1(nsMathMLmactionFrame, nsMathMLContainerFrame, nsIDOMMouseListener)
nsIFrame*
NS_NewMathMLmactionFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)

View File

@ -89,10 +89,6 @@ 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);
}

View File

@ -1652,10 +1652,7 @@ nsPluginCacheListener::~nsPluginCacheListener()
////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS2(nsPluginCacheListener,
nsIStreamListener,
nsIRequestObserver)
NS_IMPL_ISUPPORTS1(nsPluginCacheListener, nsIStreamListener)
////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsPluginCacheListener::OnStartRequest(nsIRequest *request, nsISupports* ctxt)
@ -2710,11 +2707,10 @@ nsPluginHostImpl::~nsPluginHostImpl()
}
////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS9(nsPluginHostImpl,
NS_IMPL_ISUPPORTS8(nsPluginHostImpl,
nsIPluginManager,
nsIPluginManager2,
nsIPluginHost,
nsIFactory,
nsIFileUtilities,
nsICookieStorage,
nsIObserver,
@ -7082,10 +7078,7 @@ nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request,
}
//////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS2(nsPluginByteRangeStreamListener,
nsIStreamListener,
nsIRequestObserver)
NS_IMPL_ISUPPORTS1(nsPluginByteRangeStreamListener, nsIStreamListener)
nsPluginByteRangeStreamListener::nsPluginByteRangeStreamListener(nsIWeakReference* aWeakPtr)
{
mWeakPtrPluginStreamListenerPeer = aWeakPtr;