Bug 1041525: Disable GMP OOPInit() during SyncLaunch() until crashreporting fully hooked up. r=gfritzsche,a=sylvestre
authorRandell Jesup <rjesup@jesup.org>
Mon, 21 Jul 2014 10:18:15 -0400
changeset 217234 e263af5237ff665c0f5204e10514d8ee26da2103
parent 217233 ed6f81562f094129f437650fdb07eacb3c551801
child 217235 68e087b509e067ebc6d7acaf3da57b1a780a3b31
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche, sylvestre
bugs1041525
milestone33.0a2
Bug 1041525: Disable GMP OOPInit() during SyncLaunch() until crashreporting fully hooked up. r=gfritzsche,a=sylvestre
ipc/glue/GeckoChildProcessHost.cpp
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -236,21 +236,28 @@ uint32_t GeckoChildProcessHost::GetSuppo
 #endif
 
   return base::GetCurrentProcessArchitecture();
 }
 
 void
 GeckoChildProcessHost::PrepareLaunch()
 {
+#ifndef GMP_CRASHREPORTER_READY
+// See bug 1041525
+  if (mProcessType != GeckoProcessType_GMPlugin) {
+#endif
 #ifdef MOZ_CRASHREPORTER
   if (CrashReporter::GetEnabled()) {
     CrashReporter::OOPInit();
   }
 #endif
+#ifndef GMP_CRASHREPORTER_READY
+  }
+#endif
 
 #ifdef XP_WIN
   if (mProcessType == GeckoProcessType_Plugin) {
     InitWindowsGroupID();
   }
 #endif
 }