Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 15:15:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ipcshell for newest changes to GeckoChildProcessHost

Browse Source
This commit is contained in:
Ben Turner 2009-07-21 11:41:02 -04:00
parent 50b01f1178
commit b4be1c242c
1 changed files with 11 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
toolkit/xre/nsEmbedFunctions.cpp
View File

@ -392,39 +392,6 @@ public:
namespace {
class CreateChildProcess : public Task
{
public:
CreateChildProcess(Monitor* aMonitor,
IPC::Channel** aChannelPtr)
: mMonitor(aMonitor),
mChannelPtr(aChannelPtr)
{
NS_ASSERTION(aMonitor, "Null ptr!");
}
virtual void Run() {
GeckoChildProcessHost* host =
new GeckoChildProcessHost(GeckoChildProcess_TestShell);
if (host) {
// FIXME/bent: use SyncLaunch() API to simplify this code
if (!host->AsyncLaunch()) {
delete host;
}
// ChildProcessHost deletes itself once the child process exits, on
// windows at least...
*mChannelPtr = host->GetChannel();
}
MonitorAutoEnter ae(*mMonitor);
mMonitor->Notify();
}
private:
Monitor* mMonitor;
IPC::Channel** mChannelPtr;
};
class QuitRunnable : public nsRunnable
{
public:
@ -436,30 +403,6 @@ public:
}
};
IPC::Channel*
LaunchTestShellChildProcess()
{
Monitor mon("LaunchChildProcess monitor");
IPC::Channel* channel = nsnull;
CreateChildProcess* creator = new CreateChildProcess(&mon, &channel);
NS_ENSURE_TRUE(creator, nsnull);
MessageLoop* ioLoop =
BrowserProcessSubThread::GetMessageLoop(BrowserProcessSubThread::IO);
NS_ENSURE_TRUE(ioLoop, nsnull);
{
MonitorAutoEnter ae(mon);
ioLoop->PostTask(FROM_HERE, creator);
mon.Wait();
}
return channel;
}
int
TestShellMain(int argc, char** argv)
{
@ -473,7 +416,17 @@ TestShellMain(int argc, char** argv)
nsAutoRef<XPCShellEnvironment> env(XPCShellEnvironment::CreateEnvironment());
NS_ENSURE_TRUE(env, 1);
IPC::Channel* channel = LaunchTestShellChildProcess();
GeckoChildProcessHost* host =
new GeckoChildProcessHost(GeckoChildProcess_TestShell);
NS_ENSURE_TRUE(host, 1);
if (!host->SyncLaunch()) {
NS_WARNING("Failed to launch child process!");
delete host;
return 1;
}
IPC::Channel* channel = host->GetChannel();
NS_ENSURE_TRUE(channel, 1);
TestShellParent testShellParent;