Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove support for {return,native,concrete}Type overrides in Bindings.conf.

Browse source 
We have no reason to support non-default type names, and this commit corrects
the computations for callbacks (which needed the override until now).
This commit is contained in:
Ms2ger 2014-10-10 13:13:41 +02:00
parent 2f9808e130
commit 76ba40d5cb
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/bindings/codegen/Bindings.conf
View file

@ -9,19 +9,11 @@
# The configuration table maps each interface name to a |descriptor|. # The configuration table maps each interface name to a |descriptor|.
# #
# Valid fields for all descriptors: # Valid fields for all descriptors:
# * createGlobal: True for global objects.
# * outerObjectHook: string to use in place of default value for outerObject and thisObject # * outerObjectHook: string to use in place of default value for outerObject and thisObject
# JS class hooks # JS class hooks
DOMInterfaces = { DOMInterfaces = {
'EventListener': {
'nativeType': 'EventListenerBinding::EventListener',
},
'NodeFilter': {
'nativeType': 'NodeFilterBinding::NodeFilter',
'returnType': 'NodeFilterBinding::NodeFilter',
},
'Window': { 'Window': {
'outerObjectHook': 'Some(bindings::utils::outerize_global)', 'outerObjectHook': 'Some(bindings::utils::outerize_global)',
}, },

13
components/script/dom/bindings/codegen/Configuration.py
View file

@ -147,14 +147,19 @@ class Descriptor(DescriptorProvider):
# built-in rooting mechanisms for them. # built-in rooting mechanisms for them.
if self.interface.isCallback(): if self.interface.isCallback():
self.needsRooting = False self.needsRooting = False
ty = "%sBinding::%s" % (ifaceName, ifaceName)
self.returnType = ty
self.argumentType = "???"
self.memberType = "???"
self.nativeType = ty
else: else:
self.needsRooting = True self.needsRooting = True
self.returnType = "Temporary<%s>" % ifaceName
self.returnType = desc.get('returnType', "Temporary<%s>" % ifaceName)
self.argumentType = "JSRef<%s>" % ifaceName self.argumentType = "JSRef<%s>" % ifaceName
self.memberType = "Root<'a, 'b, %s>" % ifaceName self.memberType = "Root<'a, 'b, %s>" % ifaceName
self.nativeType = desc.get('nativeType', 'JS<%s>' % ifaceName) self.nativeType = "JS<%s>" % ifaceName
self.concreteType = desc.get('concreteType', ifaceName)
self.concreteType = ifaceName
self.register = desc.get('register', True) self.register = desc.get('register', True)
self.outerObjectHook = desc.get('outerObjectHook', 'None') self.outerObjectHook = desc.get('outerObjectHook', 'None')