diff options
| author | Sankha Narayan Guria <sankha93@gmail.com> | 2014-02-27 03:31:05 +0530 |
|---|---|---|
| committer | Sankha Narayan Guria <sankha93@gmail.com> | 2014-02-27 03:31:05 +0530 |
| commit | 1e9fec9172364346937f375e315e1ce745662611 (patch) | |
| tree | a55173568e6dd6a8b4cb4dfcc42ed81204d49874 /src/components/script/dom/bindings/codegen/Configuration.py | |
| parent | 47e6e6ec8f2dfbd56e50f9f2ec2762b85087d948 (diff) | |
| parent | da16e54243e256dee927f720ce6b9903b62ec14e (diff) | |
| download | servo-1e9fec9172364346937f375e315e1ce745662611.tar.gz servo-1e9fec9172364346937f375e315e1ce745662611.zip | |
Merge master into this branch
Diffstat (limited to 'src/components/script/dom/bindings/codegen/Configuration.py')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/Configuration.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/Configuration.py b/src/components/script/dom/bindings/codegen/Configuration.py index 0c87ead0259..e28e24bbcfa 100644 --- a/src/components/script/dom/bindings/codegen/Configuration.py +++ b/src/components/script/dom/bindings/codegen/Configuration.py @@ -158,10 +158,9 @@ class Descriptor(DescriptorProvider): if self.workers: nativeTypeDefault = "workers::" + ifaceName else: - nativeTypeDefault = ifaceName + nativeTypeDefault = 'JS<%s>' % ifaceName self.nativeType = desc.get('nativeType', nativeTypeDefault) - self.pointerType = desc.get('pointerType', '@mut ') self.concreteType = desc.get('concreteType', ifaceName) self.needsAbstract = desc.get('needsAbstract', []) self.hasInstanceInterface = desc.get('hasInstanceInterface', None) @@ -253,7 +252,7 @@ class Descriptor(DescriptorProvider): self.prefable = desc.get('prefable', False) self.nativeIsISupports = not self.workers - self.customTrace = desc.get('customTrace', self.workers) + self.customTrace = desc.get('customTrace', self.workers) or 'trace' self.customFinalize = desc.get('customFinalize', self.workers) self.wrapperCache = self.workers or desc.get('wrapperCache', True) |