diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-19 19:01:48 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-19 19:01:48 -0400 |
| commit | 7f188500a12373677c7ef9feb999276c30f1068a (patch) | |
| tree | 3dceb32bd373a305f494160c037700cbd5b03956 /src/components/script/dom/node.rs | |
| parent | 26f9543e60414d5ff3890d36c5370d0804c2cf18 (diff) | |
| parent | 4ad3b6ccd160107d96df4d6925a8241403f2242a (diff) | |
| download | servo-7f188500a12373677c7ef9feb999276c30f1068a.tar.gz servo-7f188500a12373677c7ef9feb999276c30f1068a.zip | |
auto merge of #1915 : Ms2ger/servo/wrap-return-js, r=jdm
This lets us avoid the sketchy tricks in JS::new and Window::new, where we
kept an unsafe pointer to the native object across the Wrap call that
consumed the owned pointer.
Diffstat (limited to 'src/components/script/dom/node.rs')
| -rw-r--r-- | src/components/script/dom/node.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 71b2b121136..08732836dbc 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -769,7 +769,7 @@ impl Node { pub fn reflect_node<N: Reflectable+NodeBase> (node: ~N, document: &JS<Document>, - wrap_fn: extern "Rust" fn(*JSContext, &JS<Window>, ~N) -> *JSObject) + wrap_fn: extern "Rust" fn(*JSContext, &JS<Window>, ~N) -> JS<N>) -> JS<N> { assert!(node.reflector().get_jsobject().is_null()); let node = reflect_dom_object(node, &document.get().window, wrap_fn); |