Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1295053 (part 5) - Remove an unnecessary use of NS_CALLBACK in ClassInfoData. r=froydnj.

Browse Source 
--HG--
extra : rebase_source : 6b14b91e8cd4c056e40148064b396a55c6f451a3
This commit is contained in:
Nicholas Nethercote 2016-08-16 07:56:26 +10:00
parent 3873d0c8f6
commit e0229c761e
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/xpconnect/src/XPCComponents.cpp
View File

@ -3501,9 +3501,7 @@ public:
// having one.
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIXPCSCRIPTABLE
// This is NS_METHOD because NS_CALLBACK requires the referent to be
// declared __stdcall on Windows, and NS_METHOD does that.
static NS_METHOD Get(nsIXPCScriptable** helper)
static nsresult Get(nsIXPCScriptable** helper)
{
*helper = &singleton;
return NS_OK;

2
js/xpconnect/src/XPCJSID.cpp
View File

@ -239,7 +239,7 @@ static void EnsureClassObjectsInitialized()
}
}
NS_METHOD GetSharedScriptableHelperForJSIID(nsIXPCScriptable** helper)
static nsresult GetSharedScriptableHelperForJSIID(nsIXPCScriptable** helper)
{
EnsureClassObjectsInitialized();
nsCOMPtr<nsIXPCScriptable> temp = gSharedScriptableHelperForJSIID.get();

12
xpcom/glue/nsIClassInfoImpl.h
View File

@ -89,12 +89,16 @@ class GenericClassInfo : public nsIClassInfo
public:
struct ClassInfoData
{
typedef NS_CALLBACK(GetInterfacesProc)(uint32_t* aCountP,
nsIID*** aArray);
typedef NS_CALLBACK(GetScriptableHelperProc)(nsIXPCScriptable** aHelper);
// This function pointer uses NS_CALLBACK because it's always set to an
// NS_IMETHOD function, which uses __stdcall on Win32.
typedef NS_CALLBACK(GetInterfacesProc)(uint32_t* aCountP, nsIID*** aArray);
GetInterfacesProc getinterfaces;
// This function pointer doesn't use NS_CALLBACK because it's always set to
// a vanilla function.
typedef nsresult (*GetScriptableHelperProc)(nsIXPCScriptable** aHelper);
GetScriptableHelperProc getscriptablehelper;
uint32_t flags;
nsCID cid;
};