Implement HTMLUnknownElement::new.

This commit is contained in:
Ms2ger 2013-10-26 13:24:56 +02:00
parent 4eb1e88e8f
commit 49b8c7c9b7
3 changed files with 33 additions and 5 deletions

View file

@ -2,8 +2,25 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::codegen::HTMLUnknownElementBinding;
use dom::document::AbstractDocument;
use dom::element::HTMLUnknownElementTypeId;
use dom::htmlelement::HTMLElement;
use dom::node::{AbstractNode, Node, ScriptView};
pub struct HTMLUnknownElement {
htmlelement: HTMLElement
}
impl HTMLUnknownElement {
pub fn new_inherited(localName: ~str, document: AbstractDocument) -> HTMLUnknownElement {
HTMLUnknownElement {
htmlelement: HTMLElement::new(HTMLUnknownElementTypeId, localName, document)
}
}
pub fn new(localName: ~str, document: AbstractDocument) -> AbstractNode<ScriptView> {
let element = HTMLUnknownElement::new_inherited(localName, document);
Node::reflect_node(@mut element, document, HTMLUnknownElementBinding::Wrap)
}
}

View file

@ -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;
@ -481,6 +481,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);

View file

@ -304,10 +304,7 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum
handle_htmltablecellelement!(cx, document, tag, "td", HTMLTableDataCellElementTypeId, HTMLTableDataCellElement);
handle_htmltablecellelement!(cx, document, tag, "th", HTMLTableHeaderCellElementTypeId, HTMLTableHeaderCellElement);
let element = @HTMLUnknownElement {
htmlelement: HTMLElement::new(HTMLUnknownElementTypeId, tag.to_str(), document)
};
return unsafe { Node::as_abstract_node(cx, element) };
return HTMLUnknownElement::new(tag.to_str(), document);
}
pub fn parse_html(cx: *JSContext,