Backed out changeset b821b18a1bfb (bug 1189550) for breaking GU Tests
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 03 Aug 2015 09:38:27 +0200
changeset 287477 5e2d1a51d60904a6e120b5d4276bd6e9295a0566
parent 287476 976ba676a65900bb7ec13b657a3655d4a54bc11f
child 287478 b9f166a815b279ef4ed22717cf61536a346431cc
child 287510 16e644500bc3c20705caeab48705abe2813e4874
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1189550
milestone42.0a1
backs outb821b18a1bfb9ade72007868f117fc155df9e804
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset b821b18a1bfb (bug 1189550) for breaking GU Tests
dom/base/nsFrameMessageManager.cpp
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@@ -1427,24 +1427,16 @@ nsFrameMessageManager::GetInitialProcess
     if (!obj) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
     mInitialProcessData.setObject(*obj);
     init.setObject(*obj);
   }
 
-  if (!mChrome && XRE_IsParentProcess()) {
-    // This is the cpmm in the parent process. We should use the same object as the ppmm.
-    nsCOMPtr<nsIGlobalProcessScriptLoader> ppmm =
-      do_GetService("@mozilla.org/parentprocessmessagemanager;1");
-    ppmm->GetInitialProcessData(aCx, &init);
-    mInitialProcessData = init;
-  }
-
   if (!JS_WrapValue(aCx, &init)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
   aResult.set(init);
   return NS_OK;
 }
 
 namespace {
@@ -2167,16 +2159,17 @@ NS_NewChildProcessMessageManager(nsISync
   nsFrameMessageManager* mm = new nsFrameMessageManager(cb,
                                                         nullptr,
                                                         MM_PROCESSMANAGER | MM_OWNSCALLBACK);
   nsFrameMessageManager::SetChildProcessManager(mm);
   nsRefPtr<ProcessGlobal> global = new ProcessGlobal(mm);
   NS_ENSURE_TRUE(global->Init(), NS_ERROR_UNEXPECTED);
   global.forget(aResult);
   return NS_OK;
+
 }
 
 static PLDHashOperator
 CycleCollectorMarkListeners(const nsAString& aKey,
                             nsAutoTObserverArray<nsMessageListenerInfo, 1>* aListeners,
                             void* aData)
 {
   uint32_t count = aListeners->Length();