Bug 956218 - Fix build bustage for B2G-JB on a CLOSED TREE
authorBen Turner <bent.mozilla@gmail.com>
Mon, 24 Feb 2014 20:16:01 -0800
changeset 170674 653d606f540c05dad380f2dc4bc0d39cc88b69ea
parent 170673 22d6c5982c53e12468379372280d5695781e9462
child 170675 eff307d9404444e3ec2fbaf312049b31d1a88dd1
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
bugs956218
milestone30.0a1
Bug 956218 - Fix build bustage for B2G-JB on a CLOSED TREE
dom/ipc/ContentChild.cpp
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1737,17 +1737,17 @@ ContentChild::RecvNuwaFork()
     // process before we freeze. Also, we have to do this to avoid deadlock.
     // Protocols that are "opened" (e.g. PBackground, PCompositor) block the
     // main thread to wait for the IPC thread during the open operation.
     // NuwaSpawnWait() blocks the IPC thread to wait for the main thread when
     // the Nuwa process is forked. Unless we ensure that the two cannot happen
     // at the same time then we risk deadlock. Spinning the event loop here
     // guarantees the ordering is safe for PBackground.
     while (!BackgroundChild::GetForCurrentThread()) {
-        if (NS_WARN_IF(NS_FAILED(NS_ProcessNextEvent()))) {
+        if (NS_WARN_IF(!NS_ProcessNextEvent())) {
             return false;
         }
     }
 
     MessageLoop* ioloop = XRE_GetIOMessageLoop();
     ioloop->PostTask(FROM_HERE, NewRunnableFunction(RunNuwaFork));
     return true;
 #else