diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-10-13 17:00:47 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-10-13 17:00:47 -0600 |
| commit | 0ded2bb1ecb7da791c1296c2a2415f49705f8334 (patch) | |
| tree | 096ee0b58f7d5be3d5bc9ec934c394eff9b981d7 | |
| parent | a92e55597e03d6a7b71e8178cf4a7a6d760f94be (diff) | |
| parent | 76ba40d5cbb5c731a88c57ba5b1ae6fa3e186dce (diff) | |
| download | servo-0ded2bb1ecb7da791c1296c2a2415f49705f8334.tar.gz servo-0ded2bb1ecb7da791c1296c2a2415f49705f8334.zip | |
auto merge of #3632 : Ms2ger/servo/bindings-conf, r=Manishearth
We have no reason to support non-default type names, and this commit corrects
the computations for callbacks (which needed the override until now).
| -rw-r--r-- | components/script/dom/bindings/codegen/Bindings.conf | 8 | ||||
| -rw-r--r-- | components/script/dom/bindings/codegen/Configuration.py | 15 |
2 files changed, 10 insertions, 13 deletions
diff --git a/components/script/dom/bindings/codegen/Bindings.conf b/components/script/dom/bindings/codegen/Bindings.conf index f3a57a23cac..48b6067d00c 100644 --- a/components/script/dom/bindings/codegen/Bindings.conf +++ b/components/script/dom/bindings/codegen/Bindings.conf @@ -9,19 +9,11 @@ # The configuration table maps each interface name to a |descriptor|. # # Valid fields for all descriptors: -# * createGlobal: True for global objects. # * outerObjectHook: string to use in place of default value for outerObject and thisObject # JS class hooks DOMInterfaces = { -'EventListener': { - 'nativeType': 'EventListenerBinding::EventListener', -}, -'NodeFilter': { - 'nativeType': 'NodeFilterBinding::NodeFilter', - 'returnType': 'NodeFilterBinding::NodeFilter', -}, 'Window': { 'outerObjectHook': 'Some(bindings::utils::outerize_global)', }, diff --git a/components/script/dom/bindings/codegen/Configuration.py b/components/script/dom/bindings/codegen/Configuration.py index d9be43fd2e6..e76719b3edf 100644 --- a/components/script/dom/bindings/codegen/Configuration.py +++ b/components/script/dom/bindings/codegen/Configuration.py @@ -147,14 +147,19 @@ class Descriptor(DescriptorProvider): # built-in rooting mechanisms for them. if self.interface.isCallback(): self.needsRooting = False + ty = "%sBinding::%s" % (ifaceName, ifaceName) + self.returnType = ty + self.argumentType = "???" + self.memberType = "???" + self.nativeType = ty else: self.needsRooting = True + self.returnType = "Temporary<%s>" % ifaceName + self.argumentType = "JSRef<%s>" % ifaceName + self.memberType = "Root<'a, 'b, %s>" % ifaceName + self.nativeType = "JS<%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) - self.concreteType = desc.get('concreteType', ifaceName) + self.concreteType = ifaceName self.register = desc.get('register', True) self.outerObjectHook = desc.get('outerObjectHook', 'None') |