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

Bug 1442737: Use shared JSM global for compillation and privileged junk scopes. r=bholley

Browse Source 
MozReview-Commit-ID: 3rLgxQVtc0X
This commit is contained in:
Kris Maglione
2018-06-24 19:16:33 -07:00
parent 0cf27703c5
commit 587e2b56af
8 changed files with 32 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/xpconnect/loader/ScriptPreloader.cpp
View File

@@ -6,7 +6,6 @@
#include "ScriptPreloader-inl.h"
#include "mozilla/ScriptPreloader.h"
#include "mozJSComponentLoader.h"
#include "mozilla/loader/ScriptCacheActors.h"
#include "mozilla/URLPreloader.h"
@@ -437,7 +436,7 @@ ScriptPreloader::InitCache(const nsAString& basePath)
// Grab the compilation scope before initializing the URLPreloader, since
// it's not safe to run component loader code during its critical section.
AutoSafeJSAPI jsapi;
JS::RootedObject scope(jsapi.cx(), CompilationScope(jsapi.cx()));
JS::RootedObject scope(jsapi.cx(), xpc::CompilationScope());
// Note: Code on the main thread *must not access Omnijar in any way* until
// this AutoBeginReading guard is destroyed.
@@ -951,12 +950,6 @@ ScriptPreloader::DoFinishOffThreadDecode()
MaybeFinishOffThreadDecode();
}
JSObject*
ScriptPreloader::CompilationScope(JSContext* cx)
{
return mozJSComponentLoader::Get()->CompilationScope(cx);
}
void
ScriptPreloader::MaybeFinishOffThreadDecode()
{
@@ -975,7 +968,7 @@ ScriptPreloader::MaybeFinishOffThreadDecode()
AutoSafeJSAPI jsapi;
JSContext* cx = jsapi.cx();
JSAutoRealm ar(cx, CompilationScope(cx));
JSAutoRealm ar(cx, xpc::CompilationScope());
JS::Rooted<JS::ScriptVector> jsScripts(cx, JS::ScriptVector(cx));
// If this fails, we still need to mark the scripts as finished. Any that
@@ -1045,7 +1038,7 @@ ScriptPreloader::DecodeNextBatch(size_t chunkSize, JS::HandleObject scope)
AutoSafeJSAPI jsapi;
JSContext* cx = jsapi.cx();
JSAutoRealm ar(cx, scope ? scope : CompilationScope(cx));
JSAutoRealm ar(cx, scope ? scope : xpc::CompilationScope());
JS::CompileOptions options(cx);
options.setNoScriptRval(true)