Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1407735 - Make the JS loader XPCOM component use a singleton. r=kmag

Browse Source 
mozJSComponentLoader is created using XPCOM. However, you can only
call it once or it'll crash. This patch fixes that by using a
singleton macro.

MozReview-Commit-ID: Bq2k7nv9dKA

--HG--
extra : rebase_source : d2008da7628edf5db283c8a44c17e741f7ae0a96
This commit is contained in:
Andrew McCreight 2017-10-23 13:53:58 -07:00
parent f5fb237b0f
commit cd3f453103
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/xpconnect/loader/mozJSComponentLoader.cpp
View File

@ -207,8 +207,16 @@ mozJSComponentLoader::mozJSComponentLoader()
mLoaderGlobal(dom::RootingCx())
{
MOZ_ASSERT(!sSelf, "mozJSComponentLoader should be a singleton");
}
sSelf = this;
// static
already_AddRefed<mozJSComponentLoader>
mozJSComponentLoader::GetOrCreate()
{
if (!sSelf) {
sSelf = new mozJSComponentLoader();
}
return do_AddRef(sSelf);
}
#define ENSURE_DEP(name) { nsresult rv = Ensure##name(); NS_ENSURE_SUCCESS(rv, rv); }

2
js/xpconnect/loader/mozJSComponentLoader.h
View File

@ -54,6 +54,8 @@ class mozJSComponentLoader final : public mozilla::ModuleLoader,
void FindTargetObject(JSContext* aCx,
JS::MutableHandleObject aTargetObject);
static already_AddRefed<mozJSComponentLoader> GetOrCreate();
static mozJSComponentLoader* Get() { return sSelf; }
nsresult Import(const nsACString& aResourceURI, JS::HandleValue aTargetObj,

3
js/xpconnect/src/XPCModule.h
View File

@ -24,7 +24,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSID)
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIXPConnect,
nsXPConnect::GetSingleton)
NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSComponentLoader)
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(mozJSComponentLoader,
mozJSComponentLoader::GetOrCreate);
NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSSubScriptLoader)
NS_DEFINE_NAMED_CID(NS_JS_ID_CID);