Bug 1079654 - Uplift patch part 2 of bug 1040561: Don't wait Nuwa preallocated process when allocating new browser process. r=khuey, a=lmandel
authorTing-Yu Chou <janus926@gmail.com>
Thu, 09 Oct 2014 11:22:52 +0800
changeset 225673 75cd3a8fa031fbf7309c7cb960ba08c0f04e4ec8
parent 225672 b82fa46ca35ae46d9eddf625c35adcd016789508
child 225674 ad497694e25844b4cb54e4f1330fd488133871fe
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, lmandel
bugs1079654, 1040561
milestone34.0a2
Bug 1079654 - Uplift patch part 2 of bug 1040561: Don't wait Nuwa preallocated process when allocating new browser process. r=khuey, a=lmandel
dom/ipc/ContentParent.cpp
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -769,22 +769,16 @@ ContentParent::GetNewOrUsedBrowserProces
     }
 
     // Try to take and transform the preallocated process into browser.
     nsRefPtr<ContentParent> p = PreallocatedProcessManager::Take();
     if (p) {
         p->TransformPreallocatedIntoBrowser();
     } else {
       // Failed in using the preallocated process: fork from the chrome process.
-#ifdef MOZ_NUWA_PROCESS
-        if (Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
-            // Wait until the Nuwa process forks a new process.
-            return nullptr;
-        }
-#endif
         p = new ContentParent(/* app = */ nullptr,
                               aOpener,
                               aForBrowserElement,
                               /* isForPreallocated = */ false,
                               aPriority);
         p->Init();
     }