diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /js/xpconnect/loader/mozJSModuleLoader.h | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'js/xpconnect/loader/mozJSModuleLoader.h')
| -rw-r--r-- | js/xpconnect/loader/mozJSModuleLoader.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/js/xpconnect/loader/mozJSModuleLoader.h b/js/xpconnect/loader/mozJSModuleLoader.h index 0b8e5f85d9..ac118c507d 100644 --- a/js/xpconnect/loader/mozJSModuleLoader.h +++ b/js/xpconnect/loader/mozJSModuleLoader.h @@ -76,9 +76,14 @@ class mozJSModuleLoader final : public nsIMemoryReporter { return sSelf; } - JSObject* GetSharedGlobal(JSContext* aCx); + JSObject* GetSharedGlobal() { + MOZ_ASSERT(mLoaderGlobal); + return mLoaderGlobal; + } private: + void InitSharedGlobal(JSContext* aCx); + void InitSyncModuleLoaderForGlobal(nsIGlobalObject* aGlobal); void DisconnectSyncModuleLoaderFromGlobal(); @@ -86,7 +91,7 @@ class mozJSModuleLoader final : public nsIMemoryReporter { public: static mozJSModuleLoader* GetDevToolsLoader() { return sDevToolsLoader; } - static mozJSModuleLoader* GetOrCreateDevToolsLoader(); + static mozJSModuleLoader* GetOrCreateDevToolsLoader(JSContext* aCx); nsresult ImportInto(const nsACString& aResourceURI, JS::HandleValue aTargetObj, JSContext* aCx, uint8_t aArgc, |