corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 879475 - Rename the MsgStart messages to MsgStartChild for child protocols r=jlebar

Browse Source
This commit is contained in:
David Zbarsky
2013-08-20 15:46:41 -04:00
parent 7e9db3b875
commit ad87b82c7b
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ipc/glue/ProtocolUtils.cpp
View File

@@ -52,7 +52,7 @@ bool
Bridge(const PrivateIPDLInterface&,
AsyncChannel* aParentChannel, ProcessHandle aParentProcess,
AsyncChannel* aChildChannel, ProcessHandle aChildProcess,
ProtocolId aProtocol)
ProtocolId aProtocol, ProtocolId aChildProtocol)
{
ProcessId parentId = GetProcId(aParentProcess);
ProcessId childId = GetProcId(aChildProcess);
@@ -71,7 +71,7 @@ Bridge(const PrivateIPDLInterface&,
aProtocol)) ||
!aChildChannel->Send(new ChannelOpened(childSide,
parentId,
aProtocol))) {
aChildProtocol))) {
CloseDescriptor(parentSide);
CloseDescriptor(childSide);
return false;
@@ -83,7 +83,7 @@ bool
Open(const PrivateIPDLInterface&,
AsyncChannel* aOpenerChannel, ProcessHandle aOtherProcess,
Transport::Mode aOpenerMode,
ProtocolId aProtocol)
ProtocolId aProtocol, ProtocolId aChildProtocol)
{
bool isParent = (Transport::MODE_SERVER == aOpenerMode);
ProcessHandle thisHandle = GetCurrentProcessHandle();
@@ -102,7 +102,7 @@ Open(const PrivateIPDLInterface&,
}
Message* parentMsg = new ChannelOpened(parentSide, childId, aProtocol);
Message* childMsg = new ChannelOpened(childSide, parentId, aProtocol);
Message* childMsg = new ChannelOpened(childSide, parentId, aChildProtocol);
nsAutoPtr<Message> messageForUs(isParent ? parentMsg : childMsg);
nsAutoPtr<Message> messageForOtherSide(!isParent ? parentMsg : childMsg);
if (!aOpenerChannel->Echo(messageForUs.forget()) ||