Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1718529 - Part 1: Use JS_ExecuteScript instead of JS::CloneAndExecuteScript when same-realm is guaranteed. r=tcampbell

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D121255
This commit is contained in:
Tooru Fujisawa 2021-09-21 05:01:36 +00:00
parent e19e94bc52
commit 5e5fb9a749
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,7 +872,7 @@ nsresult mozJSComponentLoader::ObjectForLocation(
bool executeOk = false;
if (JS_IsGlobalObject(obj)) {
JS::RootedValue rval(cx);
executeOk = JS::CloneAndExecuteScript(aescx, script, &rval);
executeOk = JS_ExecuteScript(aescx, script, &rval);
} else {
executeOk = JS::ExecuteInJSMEnvironment(aescx, script, obj);
}

6
js/xpconnect/loader/mozJSSubScriptLoader.cpp
View File

@ -138,7 +138,7 @@ static bool EvalStencil(JSContext* cx, HandleObject targetObj,
}
if (JS_IsGlobalObject(targetObj)) {
if (!JS::CloneAndExecuteScript(cx, script, retval)) {
if (!JS_ExecuteScript(cx, script, retval)) {
return false;
}
} else if (JS::IsJSMEnvironment(targetObj)) {
@ -165,11 +165,11 @@ static bool EvalStencil(JSContext* cx, HandleObject targetObj,
!mozJSComponentLoader::Get()->IsLoaderGlobal(targetGlobal),
"Don't load subscript into target in a shared-global JSM");
#endif
if (!JS::CloneAndExecuteScript(cx, envChain, script, retval)) {
if (!JS_ExecuteScript(cx, envChain, script, retval)) {
return false;
}
} else if (JS_IsGlobalObject(loadScope)) {
if (!JS::CloneAndExecuteScript(cx, envChain, script, retval)) {
if (!JS_ExecuteScript(cx, envChain, script, retval)) {
return false;
}
} else {