corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1761938 - Part 5: Use module loader's global where possible and remove GetGlobalForRequest from script loader interface r=yulia

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D142832
This commit is contained in:
Jon Coppeard
2022-04-11 15:35:30 +00:00
parent 95257109ee
commit 42de261a2e
5 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
js/loader/ModuleLoaderBase.cpp
View File

@@ -457,16 +457,8 @@ nsresult ModuleLoaderBase::CreateModuleScript(ModuleLoadRequest* aRequest) {
LOG(("ScriptLoadRequest (%p): Create module script", aRequest));
nsCOMPtr<nsIGlobalObject> globalObject =
mLoader->GetGlobalForRequest(aRequest);
if (!globalObject) {
return NS_ERROR_FAILURE;
}
MOZ_ASSERT(globalObject == mGlobalObject);
AutoJSAPI jsapi;
if (!jsapi.Init(globalObject)) {
if (!jsapi.Init(mGlobalObject)) {
return NS_ERROR_FAILURE;
}
@@ -481,7 +473,7 @@ nsresult ModuleLoaderBase::CreateModuleScript(ModuleLoadRequest* aRequest) {
&introductionScript);
if (NS_SUCCEEDED(rv)) {
JS::Rooted<JSObject*> global(cx, globalObject->GetGlobalJSObject());
JS::Rooted<JSObject*> global(cx, mGlobalObject->GetGlobalJSObject());
rv = CompileOrFinishModuleScript(cx, global, options, aRequest, &module);
}
@@ -997,15 +989,13 @@ void ModuleLoaderBase::ProcessDynamicImport(ModuleLoadRequest* aRequest) {
}
}
nsresult ModuleLoaderBase::EvaluateModule(nsIGlobalObject* aGlobalObject,
ModuleLoadRequest* aRequest) {
nsresult ModuleLoaderBase::EvaluateModule(ModuleLoadRequest* aRequest) {
MOZ_ASSERT(aRequest->mLoader == this);
MOZ_ASSERT(aGlobalObject == mGlobalObject);
AUTO_PROFILER_LABEL("ModuleLoaderBase::EvaluateModule", JS);
mozilla::nsAutoMicroTask mt;
mozilla::dom::AutoEntryScript aes(aGlobalObject, "EvaluateModule", true);
mozilla::dom::AutoEntryScript aes(mGlobalObject, "EvaluateModule", true);
JSContext* cx = aes.cx();
nsAutoCString profilerLabelString;
@@ -1094,16 +1084,6 @@ nsresult ModuleLoaderBase::EvaluateModule(nsIGlobalObject* aGlobalObject,
return rv;
}
nsresult ModuleLoaderBase::EvaluateModule(ModuleLoadRequest* aRequest) {
nsCOMPtr<nsIGlobalObject> globalObject =
mLoader->GetGlobalForRequest(aRequest);
if (!globalObject) {
return NS_ERROR_FAILURE;
}
return EvaluateModule(globalObject, aRequest);
}
void ModuleLoaderBase::CancelAndClearDynamicImports() {
for (ScriptLoadRequest* req = mDynamicImportRequests.getFirst(); req;
req = req->getNext()) {