Backed out changeset cb808626c8df (bug 1424505) because it didn't help with the crashes. r=jimm, a=RyanVM

This commit is contained in:
Ryan VanderMeulen 2018-04-10 16:26:55 -04:00
parent 6bfadf95b4
commit 355897fc22
3 changed files with 1 additions and 22 deletions

View File

@ -2963,9 +2963,6 @@ ContentParent::Observe(nsISupports* aSubject,
#ifdef ACCESSIBILITY
else if (aData && !strcmp(aTopic, "a11y-init-or-shutdown")) {
if (*aData == '1') {
// Shut down the preallocated process manager to avoid recycled
// content processes.
PreallocatedProcessManager::Disable();
// Make sure accessibility is running in content process when
// accessibility gets initiated in chrome process.
#if defined(XP_WIN)

View File

@ -43,7 +43,6 @@ public:
void RemoveBlocker(ContentParent* aParent);
already_AddRefed<ContentParent> Take();
bool Provide(ContentParent* aParent);
void Disable();
private:
static mozilla::StaticRefPtr<PreallocatedProcessManagerImpl> sSingleton;
@ -61,6 +60,7 @@ private:
void RereadPrefs();
void Enable();
void Disable();
void CloseProcess();
void ObserveProcessShutdown(nsISupports* aSubject);
@ -335,10 +335,4 @@ PreallocatedProcessManager::Provide(ContentParent* aParent)
return GetPPMImpl()->Provide(aParent);
}
/* static */ void
PreallocatedProcessManager::Disable()
{
GetPPMImpl()->Disable();
}
} // namespace mozilla

View File

@ -55,20 +55,8 @@ public:
*/
static already_AddRefed<ContentParent> Take();
/**
* ContentParent entry point for recycling existing content processes that are
* no longer in use. This class currently only caches one instance. It is safe
* to call this repeatedly with the same process.
*
* @returns boolean indicating if aParent is cached for reuse.
*/
static bool Provide(ContentParent* aParent);
/**
* Disables this service and discards any cached content processes.
*/
static void Disable();
private:
PreallocatedProcessManager();
DISALLOW_EVIL_CONSTRUCTORS(PreallocatedProcessManager);