Bug 1361900: Part 8 - Use the script preloader in content processes in the frame script loader. r?gabor
MozReview-Commit-ID: f7AdQ5cG4k
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@@ -1603,19 +1603,17 @@ nsMessageManagerScriptExecutor::TryCache
// to avoid keeping the current compartment alive.
AutoJSAPI jsapi;
if (!jsapi.Init(xpc::CompilationScope())) {
return;
}
JSContext* cx = jsapi.cx();
JS::Rooted<JSScript*> script(cx);
- if (XRE_IsParentProcess()) {
- script = ScriptPreloader::GetChildSingleton().GetCachedScript(cx, url);
- }
+ script = ScriptPreloader::GetChildSingleton().GetCachedScript(cx, url);
if (!script) {
nsCOMPtr<nsIChannel> channel;
NS_NewChannel(getter_AddRefs(channel),
uri,
nsContentUtils::GetSystemPrincipal(),
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
nsIContentPolicy::TYPE_OTHER);
@@ -1668,19 +1666,17 @@ nsMessageManagerScriptExecutor::TryCache
MOZ_ASSERT(script);
aScriptp.set(script);
nsAutoCString scheme;
uri->GetScheme(scheme);
// We don't cache data: scripts!
if (aShouldCache && !scheme.EqualsLiteral("data")) {
- if (XRE_IsParentProcess()) {
- ScriptPreloader::GetChildSingleton().NoteScript(url, url, script);
- }
+ ScriptPreloader::GetChildSingleton().NoteScript(url, url, script);
// Root the object also for caching.
auto* holder = new nsMessageManagerScriptHolder(cx, script, aRunInGlobalScope);
sCachedScripts->Put(aURL, holder);
}
}
void
nsMessageManagerScriptExecutor::TryCacheLoadAndCompileScript(