mirror of
https://github.com/servo/servo.git
synced 2025-06-11 01:50:10 +00:00
auto merge of #2290 : saneyuki/servo/export, r=jdm
- Fix #2128 - Take over from #2220 I didn't change `InterfaceTypes.rs` to `type.rs` because `type` is very common name which might be troublesome.
This commit is contained in:
commit
b36b779d24
98 changed files with 105 additions and 107 deletions
|
@ -4178,7 +4178,7 @@ class CGRegisterProtos(CGAbstractMethod):
|
|||
self.config = config
|
||||
|
||||
def _registerProtos(self):
|
||||
lines = [" codegen::%sBinding::DefineDOMInterface(window, js_info);" % desc.name
|
||||
lines = [" codegen::BindingDeclarations::%sBinding::DefineDOMInterface(window, js_info);" % desc.name
|
||||
for desc in self.config.getDescriptors(hasInterfaceObject=True,
|
||||
register=True)]
|
||||
return '\n'.join(lines) + '\n'
|
||||
|
@ -4302,6 +4302,7 @@ class CGBindingRoot(CGThing):
|
|||
'dom::bindings::conversions::IDLInterface',
|
||||
'dom::bindings::conversions::{Default, Empty}',
|
||||
'dom::bindings::codegen::*',
|
||||
'dom::bindings::codegen::BindingDeclarations::*',
|
||||
'dom::bindings::codegen::UnionTypes::*',
|
||||
'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult}',
|
||||
'dom::bindings::error::{throw_method_failed_with_details}',
|
||||
|
@ -5230,7 +5231,7 @@ class GlobalGenRoots():
|
|||
|
||||
def pathToType(descriptor):
|
||||
if descriptor.interface.isCallback():
|
||||
return "dom::bindings::codegen::%sBinding" % descriptor.name
|
||||
return "dom::bindings::codegen::BindingDeclarations::%sBinding" % descriptor.name
|
||||
return "dom::%s" % descriptor.name.lower()
|
||||
|
||||
descriptors = [d.name for d in config.getDescriptors(register=True, hasInterfaceObject=True)]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue