Bug 1142229, part 2 - Shut down the Nuwa process when its PContentParent::Close() is called. r=tlee

This commit is contained in:
Cervantes Yu 2015-04-09 15:26:50 +08:00
parent e2cc96eccf
commit 54c3d90c25

View File

@ -1855,6 +1855,14 @@ ContentChild::ActorDestroy(ActorDestroyReason why)
} }
mIsAlive = false; mIsAlive = false;
#ifdef MOZ_NUWA_PROCESS
if (IsNuwaProcess()) {
// The Nuwa cannot go through the full XPCOM shutdown path or deadlock
// will result.
QuickExit();
}
#endif
XRE_ShutdownChildProcess(); XRE_ShutdownChildProcess();
} }