Merge m-c to fx-team.

--HG--
extra : rebase_source : 254e0b1bd1d0cca6e09269d1b8f81bf0be5373d9

b2g/app/B2GLoader.cpp

@@ -215,13 +215,6 @@ RunProcesses(int argc, const char *argv[])
     return XRE_ProcLoaderServiceRun(getppid(), childSock, argc, argv);
   }
 
-  // Reap zombie child process.
-  struct sigaction sa;
-  sa.sa_handler = SIG_IGN;
-  sigemptyset(&sa.sa_mask);
-  sa.sa_flags = 0;
-  sigaction(SIGCHLD, &sa, nullptr);
-
   // The b2g process
   int childPid = pid;
   XRE_ProcLoaderClientInit(childPid, parentSock);

b2g/app/b2g.js

@@ -754,11 +754,13 @@ pref("hal.processPriorityManager.gonk.notifyLowMemUnderKB", 14336);
 // blocked on a poll(), and this pref has no effect.)
 pref("gonk.systemMemoryPressureRecoveryPollMS", 5000);
 
+#ifndef DEBUG
 // Enable pre-launching content processes for improved startup time
 // (hiding latency).
 pref("dom.ipc.processPrelaunch.enabled", true);
 // Wait this long before pre-launching a new subprocess.
 pref("dom.ipc.processPrelaunch.delayMs", 5000);
+#endif
 
 pref("dom.ipc.reuse_parent_app", false);
 

ipc/glue/ProcessUtils_linux.cpp

@@ -28,7 +28,6 @@
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/DebugOnly.h"
 #include "base/process_util.h"
-#include "mozilla/Preferences.h"
 
 #include "prenv.h"
 
@@ -191,14 +190,6 @@ ProcLoaderClientGeckoInit()
   MOZ_ASSERT(!sProcLoaderClientGeckoInitialized,
              "call ProcLoaderClientGeckoInit() more than once");
 
-  if (!Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
-    kill(sProcLoaderPid, SIGKILL);
-    sProcLoaderPid = 0;
-    close(sProcLoaderChannelFd);
-    sProcLoaderChannelFd = -1;
-    return;
-  }
-
   sProcLoaderClientGeckoInitialized = true;
 
   FileDescriptor *fd = new FileDescriptor(sProcLoaderChannelFd);