Merge pull request #3183 from ChrisParis/callback-return

Support callback return types in codegen
This commit is contained in:
Josh Matthews 2014-08-29 11:08:49 -04:00
commit e40f54bfef
2 changed files with 2 additions and 2 deletions

View file

@ -1030,7 +1030,7 @@ def typeRetValNeedsRooting(type):
return False
if type.nullable():
type = type.inner
return type.isGeckoInterface() and not type.isCallback()
return type.isGeckoInterface() and not type.isCallback() and not type.isCallbackInterface()
def memberIsCreator(member):
return member.getExtendedAttribute("Creator") is not None

View file

@ -150,7 +150,7 @@ class Descriptor(DescriptorProvider):
else:
self.needsRooting = True
self.returnType = "Temporary<%s>" % ifaceName
self.returnType = desc.get('returnType', "Temporary<%s>" % ifaceName)
self.argumentType = "JSRef<%s>" % ifaceName
self.memberType = "Root<'a, 'b, %s>" % ifaceName
self.nativeType = desc.get('nativeType', 'JS<%s>' % ifaceName)