Bug 948545 - Nuwa process shouldn't exist if dom.ipc.processPrelaunch.enabled is false. r=khuey, a=1.3+
authorPatrick Wang <kk1fff@patrickz.net>
Fri, 13 Dec 2013 16:38:08 +0800
changeset 175357 8325c38a2f049ee93576f6c26b8e412c5ccca45e
parent 175356 369bdbff6c3810d0680921107fb4240cc0732669
child 175358 90cf56c3fc35ce1866b9e49bcff039b657ec4d6e
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, 1
bugs948545
milestone28.0a2
Bug 948545 - Nuwa process shouldn't exist if dom.ipc.processPrelaunch.enabled is false. r=khuey, a=1.3+
dom/ipc/PreallocatedProcessManager.cpp
--- a/dom/ipc/PreallocatedProcessManager.cpp
+++ b/dom/ipc/PreallocatedProcessManager.cpp
@@ -241,17 +241,17 @@ PreallocatedProcessManagerImpl::Schedule
 void
 PreallocatedProcessManagerImpl::DelayedNuwaFork()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   mPreallocateAppProcessTask = nullptr;
 
   if (!mIsNuwaReady) {
-    if (!mPreallocatedAppProcess && !mShutdown) {
+    if (!mPreallocatedAppProcess && !mShutdown && mEnabled) {
       mPreallocatedAppProcess = ContentParent::RunNuwaProcess();
     }
     // else mPreallocatedAppProcess is starting. It will NuwaFork() when ready.
   } else if (mSpareProcesses.IsEmpty()) {
     NuwaFork();
   }
 }