Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-05-24 09:03:14 +08:00
commit 96e3781bd9
3 changed files with 22 additions and 8 deletions

View file

@ -2363,11 +2363,14 @@ ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest)
JS::Rooted<JSScript*> script(cx);
script = exec.GetScript();
// Create a ClassicScript object and associate it with the
// JSScript.
RefPtr<ClassicScript> classicScript = new ClassicScript(
aRequest->mFetchOptions, aRequest->mBaseURL);
classicScript->AssociateWithScript(script);
// With scripts disabled GetScript() will return nullptr
if (script) {
// Create a ClassicScript object and associate it with the
// JSScript.
RefPtr<ClassicScript> classicScript = new ClassicScript(
aRequest->mFetchOptions, aRequest->mBaseURL);
classicScript->AssociateWithScript(script);
}
rv = exec.ExecScript();
}