Bug 1041525: Disable GMP OOPInit() during SyncLaunch() until crashreporting fully hooked up r=gfritzsche
authorRandell Jesup <rjesup@jesup.org>
Mon, 21 Jul 2014 10:24:29 -0400
changeset 195339 fa68d4a514cda691ce68c1957fca105d0785690d
parent 195338 81215b610d8daf10b6664a810cefdfc8a8a30587
child 195340 cf02c8f760b17cc45f55254d46961d4e4795ba52
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersgfritzsche
bugs1041525
milestone33.0a1
Bug 1041525: Disable GMP OOPInit() during SyncLaunch() until crashreporting fully hooked up r=gfritzsche
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
 }