diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-11-05 09:34:25 -0800 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-11-05 09:34:25 -0800 |
| commit | d00736a9c059f08c8b411b3aada795e8bb9e2ea3 (patch) | |
| tree | dbb2f460a9de5d1b0bd2ef01c18fd5a5b69a007f /src/components/script/dom/bindings/utils.rs | |
| parent | 978f16f1926850d433d9b1c175314edbe30248cd (diff) | |
| parent | ad658ba4ecc35187e194124c1b1acffea3d214bc (diff) | |
| download | servo-d00736a9c059f08c8b411b3aada795e8bb9e2ea3.tar.gz servo-d00736a9c059f08c8b411b3aada795e8bb9e2ea3.zip | |
auto merge of #1189 : Ms2ger/servo/new-node, r=jdm
Diffstat (limited to 'src/components/script/dom/bindings/utils.rs')
| -rw-r--r-- | src/components/script/dom/bindings/utils.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index a97db130bb2..42f1eb7f4fc 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -4,7 +4,6 @@ use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; -use dom::bindings::node; use dom::window; use dom::node::{AbstractNode, ScriptView}; @@ -754,14 +753,11 @@ pub trait DerivedWrapper { impl DerivedWrapper for AbstractNode<ScriptView> { #[fixed_stack_segment] - fn wrap(&mut self, cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { + fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { let obj = self.reflector().get_jsobject(); - if obj.is_not_null() { - unsafe { *vp = RUST_OBJECT_TO_JSVAL(obj) }; - return 1; - } - unsafe { *vp = RUST_OBJECT_TO_JSVAL(node::create(cx, self)) }; - return 1; + assert!(obj.is_not_null()); + unsafe { *vp = RUST_OBJECT_TO_JSVAL(obj) }; + return true as i32; } } |