Bug 1515497 - pt 2 - remove assert, but warn if rddOpened is false. r=bryce a=pascalc
authorMichael Froman <mfroman@mozilla.com>
Fri, 19 Apr 2019 21:11:33 +0000
changeset 526394 82662d1130d18f74646dcc3fcc3fba902e443ddc
parent 526393 6e4ff735f7bf96ef0c0a5150a8f650a500c79625
child 526395 9d58201430493a7c6328ee32dcea55b3ca98a154
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbryce, pascalc
bugs1515497
milestone67.0
Bug 1515497 - pt 2 - remove assert, but warn if rddOpened is false. r=bryce a=pascalc Depends on D28204 Differential Revision: https://phabricator.services.mozilla.com/D28205
dom/ipc/ContentParent.cpp
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -1063,19 +1063,18 @@ mozilla::ipc::IPCResult ContentParent::R
   if (XRE_IsParentProcess() &&
       BrowserTabsRemoteAutostart() &&  // only do rdd process if e10s on
       Preferences::GetBool("media.rdd-process.enabled", false)) {
     RDDProcessManager* rdd = RDDProcessManager::Get();
     if (rdd) {
       rdd->LaunchRDDProcess();
 
       bool rddOpened = rdd->CreateContentBridge(OtherPid(), aEndpoint);
-      MOZ_ASSERT(rddOpened);
-
-      if (!rddOpened) {
+
+      if (NS_WARN_IF(!rddOpened)) {
         *aRv = NS_ERROR_NOT_AVAILABLE;
       }
     } else {
       *aRv = NS_ERROR_NOT_AVAILABLE;
     }
   }
 
   return IPC_OK();