Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 792652 - IToplevelProtocol refactoring (r=dvander)

Browse Source 
Currently toplevel protocols inherit from both IProtocolManager<IProtocol>
and IToplevelProtocol. This change makes IToplevelProtocol inherit from
IProtocol, so now toplevel protocols only inherit from
IToplevelProtocol.
This commit is contained in:
Bill McCloskey 2016-10-28 21:42:23 -07:00
parent 2dc5f495db
commit 5dee271cac
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/glue/ProtocolUtils.h
View File

@ -176,7 +176,7 @@ class Endpoint;
* IToplevelProtocol tracks all top-level protocol actors created from
* this protocol actor.
*/
class IToplevelProtocol
class IToplevelProtocol : public IProtocol
{
template<class PFooSide> friend class Endpoint;

12
ipc/ipdl/ipdl/lower.py
View File

@ -2809,10 +2809,13 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
CppDirective('include', '"'+ p.channelHeaderFile() +'"'),
Whitespace.NL ])
optinherits = []
inherits = []
if ptype.isToplevel():
optinherits.append(Inherit(p.openedProtocolInterfaceType(),
viz='public'))
inherits.append(Inherit(p.openedProtocolInterfaceType(),
viz='public'))
else:
inherits.append(Inherit(p.managerInterfaceType(), viz='public'))
if ptype.isToplevel() and self.side is 'parent':
self.hdrfile.addthings([
_makeForwardDeclForQClass('nsIFile', []),
@ -2821,8 +2824,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
self.cls = Class(
self.clsname,
inherits=[ Inherit(p.managerInterfaceType(), viz='public') ] +
optinherits,
inherits=inherits,
abstract=True)
bridgeActorsCreated = ProcessGraph.bridgeEndpointsOf(ptype, self.side)