diff options
author | bors-servo <release+servo@mozilla.com> | 2013-10-29 12:17:44 -0700 |
---|---|---|
committer | bors-servo <release+servo@mozilla.com> | 2013-10-29 12:17:44 -0700 |
commit | 2c3d5ec79f62744be530d6bc9ea7210a1116c828 (patch) | |
tree | 8a508e8d3f366203ead5bb0f5a6f95e9b7326958 /src/components/script/dom/node.rs | |
parent | d4744fe0890e93c4bb2bd4a30505080f2ca8813d (diff) | |
parent | 49b8c7c9b78ac51a6280b914bcdaef8c34d46570 (diff) | |
download | servo-2c3d5ec79f62744be530d6bc9ea7210a1116c828.tar.gz servo-2c3d5ec79f62744be530d6bc9ea7210a1116c828.zip |
auto merge of #1138 : Ms2ger/servo/reflect-HTMLUnknownElement, r=jdm
@jdm: I think we should move nodes more in line with the rest of the DOM. How do you feel about something like this?
Diffstat (limited to 'src/components/script/dom/node.rs')
-rw-r--r-- | src/components/script/dom/node.rs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 98ae7237283..680f6fbab19 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -5,7 +5,7 @@ //! The core DOM types. Defines the basic DOM hierarchy as well as all the HTML elements. use dom::bindings::node; -use dom::bindings::utils::{Reflectable, Reflector}; +use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{DOMString, null_str_as_empty}; use dom::bindings::utils::{ErrorResult, Fallible, NotFound, HierarchyRequest}; use dom::characterdata::CharacterData; @@ -485,6 +485,20 @@ impl Node<ScriptView> { node } + pub fn reflect_node<N: Reflectable> + (node: @mut N, + document: AbstractDocument, + wrap_fn: extern "Rust" fn(*JSContext, *JSObject, @mut N) -> *JSObject) + -> AbstractNode<ScriptView> { + assert!(node.reflector().get_jsobject().is_null()); + let node = reflect_dom_object(node, document.document().window, wrap_fn); + assert!(node.reflector().get_jsobject().is_not_null()); + // This surrenders memory management of the node! + AbstractNode { + obj: unsafe { transmute(node) }, + } + } + pub fn add_to_doc(&mut self, abstract_self: AbstractNode<ScriptView>, doc: AbstractDocument) { let old_doc = self.owner_doc(); self.set_owner_doc(doc); |