diff options
Diffstat (limited to 'dom/script')
-rw-r--r-- | dom/script/ModuleScript.cpp | 6 | ||||
-rw-r--r-- | dom/script/ScriptLoader.cpp | 8 | ||||
-rw-r--r-- | dom/script/ScriptLoader.h | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/dom/script/ModuleScript.cpp b/dom/script/ModuleScript.cpp index b2a72e628..9f7fe9ab9 100644 --- a/dom/script/ModuleScript.cpp +++ b/dom/script/ModuleScript.cpp @@ -58,9 +58,9 @@ ModuleScript::UnlinkModuleRecord() { // Remove module's back reference to this object request if present. if (mModuleRecord) { - MOZ_ASSERT(JS::GetModulePrivate(mModuleRecord).toPrivate() == + MOZ_ASSERT(JS::GetModuleHostDefinedField(mModuleRecord).toPrivate() == this); - JS::SetModulePrivate(mModuleRecord, JS::UndefinedValue()); + JS::SetModuleHostDefinedField(mModuleRecord, JS::UndefinedValue()); mModuleRecord = nullptr; } } @@ -83,7 +83,7 @@ ModuleScript::SetModuleRecord(JS::Handle<JSObject*> aModuleRecord) // Make module's host defined field point to this module script object. // This is cleared in the UnlinkModuleRecord(). - JS::SetModulePrivate(mModuleRecord, JS::PrivateValue(this)); + JS::SetModuleHostDefinedField(mModuleRecord, JS::PrivateValue(this)); HoldJSObjects(this); } diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp index 8058c8caa..5b7bea8d2 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp @@ -798,13 +798,13 @@ ScriptLoader::StartFetchingModuleAndDependencies(ModuleLoadRequest* aParent, // 8.1.3.8.1 HostResolveImportedModule(referencingModule, specifier) JSObject* -HostResolveImportedModule(JSContext* aCx, - JS::Handle<JS::Value> aReferencingPrivate, +HostResolveImportedModule(JSContext* aCx, JS::Handle<JSObject*> aModule, JS::Handle<JSString*> aSpecifier) { // Let referencing module script be referencingModule.[[HostDefined]]. - auto script = static_cast<ModuleScript*>(aReferencingPrivate.toPrivate()); - MOZ_ASSERT(JS::GetModulePrivate(script->ModuleRecord()) == aReferencingPrivate); + JS::Value value = JS::GetModuleHostDefinedField(aModule); + auto script = static_cast<ModuleScript*>(value.toPrivate()); + MOZ_ASSERT(script->ModuleRecord() == aModule); // Let url be the result of resolving a module specifier given referencing // module script and specifier. diff --git a/dom/script/ScriptLoader.h b/dom/script/ScriptLoader.h index 8cbcf7b96..ec9524f14 100644 --- a/dom/script/ScriptLoader.h +++ b/dom/script/ScriptLoader.h @@ -630,9 +630,8 @@ private: ModuleScript* GetFetchedModule(nsIURI* aURL) const; friend JSObject* - HostResolveImportedModule(JSContext* aCx, - JS::Handle<JS::Value> aReferencingPrivate, - JS::Handle<JSString*> aSpecifier); + HostResolveImportedModule(JSContext* aCx, JS::Handle<JSObject*> aModule, + JS::Handle<JSString*> aSpecifier); nsresult CreateModuleScript(ModuleLoadRequest* aRequest); nsresult ProcessFetchedModuleSource(ModuleLoadRequest* aRequest); |