зеркало из https://github.com/mozilla/pjs.git
Bug 625060: Make sure XRE_ShutdownChildProcess() actually does that on mac. r=bent a=b
--HG-- extra : rebase_source : b19e92d6a4f8300c19340b60936f63d58b9e9935
This commit is contained in:
Родитель
a7284fdc02
Коммит
bb406b0002
|
@ -700,6 +700,16 @@ XRE_ShutdownChildProcess()
|
||||||
// (4) ProcessChild joins the IO thread
|
// (4) ProcessChild joins the IO thread
|
||||||
// (5) exit()
|
// (5) exit()
|
||||||
MessageLoop::current()->Quit();
|
MessageLoop::current()->Quit();
|
||||||
|
#if defined(XP_MACOSX)
|
||||||
|
nsCOMPtr<nsIAppShell> appShell(do_GetService(kAppShellCID));
|
||||||
|
if (appShell) {
|
||||||
|
// On Mac, we might be only above nsAppShell::Run(), not
|
||||||
|
// MessagePump::Run(). See XRE_RunAppShell(). To account for
|
||||||
|
// that case, we fire off an Exit() here. If we were indeed
|
||||||
|
// above MessagePump::Run(), this Exit() is just superfluous.
|
||||||
|
appShell->Exit();
|
||||||
|
}
|
||||||
|
#endif // XP_MACOSX
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче