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

Bug 1645510: Part 2 - Avoid using the unprivileged junk scope where possible. r=bholley

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D79720
This commit is contained in:
Kris Maglione
2020-06-27 03:06:28 +00:00
parent 5e6b872087
commit e443589f1b
12 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dom/script/ScriptSettings.cpp
View File

@@ -747,11 +747,16 @@ AutoSlowOperation::AutoSlowOperation(
void AutoSlowOperation::CheckForInterrupt() {
// For now we support only main thread!
if (mIsMainThread) {
// JS_CheckForInterrupt expects us to be in a realm.
AutoJSAPI jsapi;
if (jsapi.Init(xpc::UnprivilegedJunkScope())) {
JS_CheckForInterrupt(jsapi.cx());
}
// JS_CheckForInterrupt expects us to be in a realm, so we use a junk scope.
// In principle, it doesn't matter which one we use, since we aren't really
// running scripts here, and none of our interrupt callbacks can stop
// scripts in a junk scope anyway. In practice, though, the privileged junk
// scope is the same as the JSM global, and therefore always exists, while
// the unprivileged junk scope is created lazily, and may not exist until we
// try to use it. So we use the former for the sake of efficiency.
dom::AutoJSAPI jsapi;
MOZ_ALWAYS_TRUE(jsapi.Init(xpc::PrivilegedJunkScope()));
JS_CheckForInterrupt(jsapi.cx());
}
}