mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
Backed out changeset 26389c6e73ff (bug 1341008)
This commit is contained in:
parent
151ed266bc
commit
827fd8b459
@ -1526,10 +1526,6 @@ pref("browser.esedbreader.loglevel", "Error");
|
|||||||
|
|
||||||
pref("browser.laterrun.enabled", false);
|
pref("browser.laterrun.enabled", false);
|
||||||
|
|
||||||
#ifdef NIGHTLY_BUILD
|
|
||||||
pref("dom.ipc.processPrelaunch.enabled", true);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef EARLY_BETA_OR_EARLIER
|
#ifdef EARLY_BETA_OR_EARLIER
|
||||||
pref("browser.migrate.automigrate.enabled", true);
|
pref("browser.migrate.automigrate.enabled", true);
|
||||||
#else
|
#else
|
||||||
|
3
browser/extensions/formautofill/bootstrap.js
vendored
3
browser/extensions/formautofill/bootstrap.js
vendored
@ -60,9 +60,6 @@ function startup() {
|
|||||||
Services.wm.addListener(windowListener);
|
Services.wm.addListener(windowListener);
|
||||||
|
|
||||||
parent.init();
|
parent.init();
|
||||||
Services.ppmm.loadProcessScript("data:,new " + function() {
|
|
||||||
Components.utils.import("resource://formautofill/FormAutofillContent.jsm");
|
|
||||||
}, true);
|
|
||||||
Services.mm.loadFrameScript("chrome://formautofill/content/FormAutofillFrameScript.js", true);
|
Services.mm.loadFrameScript("chrome://formautofill/content/FormAutofillFrameScript.js", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,13 +49,6 @@ function promiseMessage(messageManager, message) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
add_task(function*(){
|
|
||||||
// We want to count processes in this test, so let's disable the pre-allocated process manager.
|
|
||||||
yield SpecialPowers.pushPrefEnv({"set": [
|
|
||||||
["dom.ipc.processPrelaunch.enabled", false],
|
|
||||||
]});
|
|
||||||
})
|
|
||||||
|
|
||||||
add_task(function*(){
|
add_task(function*(){
|
||||||
// This test is only relevant in e10s.
|
// This test is only relevant in e10s.
|
||||||
if (!gMultiProcessBrowser)
|
if (!gMultiProcessBrowser)
|
||||||
|
@ -623,6 +623,9 @@ ContentParent::StartUp()
|
|||||||
|
|
||||||
BackgroundChild::Startup();
|
BackgroundChild::Startup();
|
||||||
|
|
||||||
|
// Try to preallocate a process that we can use later.
|
||||||
|
PreallocatedProcessManager::AllocateAfterDelay();
|
||||||
|
|
||||||
sDisableUnsafeCPOWWarnings = PR_GetEnv("DISABLE_UNSAFE_CPOW_WARNINGS");
|
sDisableUnsafeCPOWWarnings = PR_GetEnv("DISABLE_UNSAFE_CPOW_WARNINGS");
|
||||||
|
|
||||||
#if defined(XP_LINUX) && defined(MOZ_CONTENT_SANDBOX)
|
#if defined(XP_LINUX) && defined(MOZ_CONTENT_SANDBOX)
|
||||||
|
@ -132,8 +132,6 @@ PreallocatedProcessManagerImpl::Observe(nsISupports* aSubject,
|
|||||||
os->RemoveObserver(this, "ipc:content-shutdown");
|
os->RemoveObserver(this, "ipc:content-shutdown");
|
||||||
os->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
|
os->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
|
||||||
}
|
}
|
||||||
mShutdown = true;
|
|
||||||
CloseProcess();
|
|
||||||
} else {
|
} else {
|
||||||
MOZ_ASSERT(false);
|
MOZ_ASSERT(false);
|
||||||
}
|
}
|
||||||
@ -144,8 +142,7 @@ PreallocatedProcessManagerImpl::Observe(nsISupports* aSubject,
|
|||||||
void
|
void
|
||||||
PreallocatedProcessManagerImpl::RereadPrefs()
|
PreallocatedProcessManagerImpl::RereadPrefs()
|
||||||
{
|
{
|
||||||
if (mozilla::BrowserTabsRemoteAutostart() &&
|
if (Preferences::GetBool("dom.ipc.processPrelaunch.enabled")) {
|
||||||
Preferences::GetBool("dom.ipc.processPrelaunch.enabled")) {
|
|
||||||
Enable();
|
Enable();
|
||||||
} else {
|
} else {
|
||||||
Disable();
|
Disable();
|
||||||
@ -202,7 +199,7 @@ PreallocatedProcessManagerImpl::AllocateOnIdle()
|
|||||||
void
|
void
|
||||||
PreallocatedProcessManagerImpl::AllocateNow()
|
PreallocatedProcessManagerImpl::AllocateNow()
|
||||||
{
|
{
|
||||||
if (!mEnabled || mPreallocatedProcess || mShutdown ||
|
if (!mEnabled || mPreallocatedProcess ||
|
||||||
ContentParent::IsMaxProcessCountReached(NS_LITERAL_STRING(DEFAULT_REMOTE_TYPE))) {
|
ContentParent::IsMaxProcessCountReached(NS_LITERAL_STRING(DEFAULT_REMOTE_TYPE))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1063,10 +1063,6 @@ var RemoteAddonsParent = {
|
|||||||
|
|
||||||
Services.ppmm.initialProcessData.remoteAddonsParentInitted = true;
|
Services.ppmm.initialProcessData.remoteAddonsParentInitted = true;
|
||||||
|
|
||||||
Services.ppmm.loadProcessScript("data:,new " + function() {
|
|
||||||
Components.utils.import("resource://gre/modules/RemoteAddonsChild.jsm");
|
|
||||||
}, true);
|
|
||||||
|
|
||||||
this.globalToBrowser = new WeakMap();
|
this.globalToBrowser = new WeakMap();
|
||||||
this.browserToGlobal = new WeakMap();
|
this.browserToGlobal = new WeakMap();
|
||||||
},
|
},
|
||||||
|
@ -65,6 +65,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Schemas",
|
|||||||
XPCOMUtils.defineLazyModuleGetter(this, "Task",
|
XPCOMUtils.defineLazyModuleGetter(this, "Task",
|
||||||
"resource://gre/modules/Task.jsm");
|
"resource://gre/modules/Task.jsm");
|
||||||
|
|
||||||
|
Cu.import("resource://gre/modules/ExtensionContent.jsm");
|
||||||
Cu.import("resource://gre/modules/ExtensionManagement.jsm");
|
Cu.import("resource://gre/modules/ExtensionManagement.jsm");
|
||||||
Cu.import("resource://gre/modules/ExtensionParent.jsm");
|
Cu.import("resource://gre/modules/ExtensionParent.jsm");
|
||||||
Cu.import("resource://gre/modules/ExtensionUtils.jsm");
|
Cu.import("resource://gre/modules/ExtensionUtils.jsm");
|
||||||
@ -1003,7 +1004,3 @@ this.Extension = class extends ExtensionData {
|
|||||||
return this.manifest.name;
|
return this.manifest.name;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Services.ppmm.loadProcessScript("data:,new " + function() {
|
|
||||||
Components.utils.import("resource://gre/modules/ExtensionContent.jsm");
|
|
||||||
}, true);
|
|
||||||
|
Loading…
Reference in New Issue
Block a user