Bug 1110271 - Use the default message pump for GMP children r=joshmoz

--HG--
extra : rebase_source : 0c303d2ced297d33997e0dc061bba1e92fe47113
extra : histedit_source : e7163bf19fb9e3f7f40273baa63a9e65d9b0b1cd
This commit is contained in:
James Willcox 2014-12-15 16:04:21 -06:00
parent ab155d5da1
commit c562e8f15b

View File

@ -493,6 +493,9 @@ XRE_InitChildProcess(int aArgc,
// Content processes need the XPCOM/chromium frankenventloop
uiLoopType = MessageLoop::TYPE_MOZILLA_CHILD;
break;
case GeckoProcessType_GMPlugin:
uiLoopType = MessageLoop::TYPE_DEFAULT;
break;
default:
uiLoopType = MessageLoop::TYPE_UI;
break;
@ -741,7 +744,7 @@ struct RunnableMethodTraits<ContentChild>
void
XRE_ShutdownChildProcess()
{
NS_ABORT_IF_FALSE(MessageLoopForUI::current(), "Wrong thread!");
NS_ABORT_IF_FALSE(NS_IsMainThread(), "Wrong thread!");
mozilla::DebugOnly<MessageLoop*> ioLoop = XRE_GetIOMessageLoop();
NS_ABORT_IF_FALSE(!!ioLoop, "Bad shutdown order");