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

auto merge of #2636 : Ms2ger/servo/registerbindings, r=larsbergstrom

Browse source 
JS<T> should only be used for members of traced structures; the correct type
for arguments is JSRef.
This commit is contained in:
bors-servo 2014-06-11 13:09:05 -04:00
commit d255a83a48
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2078,7 +2078,7 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
"""
def __init__(self, descriptor):
args = [
Argument('&JS<Window>', 'window'),
Argument('&JSRef<Window>', 'window'),
Argument('&mut JSPageInfo', 'js_info'),
]
CGAbstractMethod.__init__(self, descriptor, 'DefineDOMInterface', 'void', args, pub=True)
@ -4192,7 +4192,7 @@ class CGDictionary(CGThing):
class CGRegisterProtos(CGAbstractMethod):
def __init__(self, config):
arguments = [
Argument('&JS<Window>', 'window'),
Argument('&JSRef<Window>', 'window'),
Argument('&mut JSPageInfo', 'js_info'),
]
CGAbstractMethod.__init__(self, None, 'Register', 'void', arguments,

2
src/components/script/script_task.rs
View file

@ -956,7 +956,7 @@ impl ScriptTask {
with_compartment((**cx).ptr, window.reflector().get_jsobject(), || {
let mut js_info = page.mut_js_info();
RegisterBindings::Register(&window.unrooted(), js_info.get_mut_ref());
RegisterBindings::Register(&*window, js_info.get_mut_ref());
});
self.compositor.set_ready_state(Loading);