Bug 1437605 - part 2 - use NS_IMPL_QUERY_INTERFACE_CI in js/xpconnect/; r=mccr8

Just like part 1, only for classes that also require classinfo.
This commit is contained in:
Nathan Froyd 2018-02-13 09:57:33 -05:00
parent 276f4b0515
commit 7a24d1ffc2

View File

@ -274,13 +274,10 @@ void xpc_DestroyJSxIDClassObjects()
/***************************************************************************/
NS_INTERFACE_MAP_BEGIN(nsJSIID)
NS_INTERFACE_MAP_ENTRY(nsIJSID)
NS_INTERFACE_MAP_ENTRY(nsIJSIID)
NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIJSID)
NS_IMPL_QUERY_CLASSINFO(nsJSIID)
NS_INTERFACE_MAP_END
NS_IMPL_QUERY_INTERFACE_CI(nsJSIID,
nsIJSID,
nsIJSIID,
nsIXPCScriptable)
NS_IMPL_ADDREF(nsJSIID)
NS_IMPL_RELEASE(nsJSIID)
@ -531,13 +528,10 @@ nsJSIID::HasInstance(nsIXPConnectWrappedNative* wrapper,
/***************************************************************************/
NS_INTERFACE_MAP_BEGIN(nsJSCID)
NS_INTERFACE_MAP_ENTRY(nsIJSID)
NS_INTERFACE_MAP_ENTRY(nsIJSCID)
NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIJSID)
NS_IMPL_QUERY_CLASSINFO(nsJSCID)
NS_INTERFACE_MAP_END
NS_IMPL_QUERY_INTERFACE_CI(nsJSCID,
nsIJSID,
nsIJSCID,
nsIXPCScriptable)
NS_IMPL_ADDREF(nsJSCID)
NS_IMPL_RELEASE(nsJSCID)