diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index 6b79b533b66..9ab2e1d3042 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -575,7 +575,7 @@ def addHTMLElement(element, concrete=None, needsAbstract=[]): addHTMLElement('Comment') addHTMLElement('DocumentFragment', concrete='DocumentFragment') -addHTMLElement('DocumentType', concrete='DocumentType') +addHTMLElement('DocumentType') addHTMLElement('Text') addHTMLElement('HTMLAnchorElement') diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs index 4c02afa4900..1d0c7f6cf24 100644 --- a/src/components/script/dom/bindings/element.rs +++ b/src/components/script/dom/bindings/element.rs @@ -5,7 +5,6 @@ use dom::types::*; use dom::bindings::codegen::*; use dom::bindings::utils::{BindingObject, Reflector, Reflectable, Traceable}; -use dom::node::ScriptView; use js::jsapi::{JSContext, JSObject, JSTracer}; @@ -132,9 +131,9 @@ generate_traceable!(Comment) generate_cacheable_wrapper_node!(DocumentFragment, DocumentFragmentBinding::Wrap) generate_binding_object_node!(DocumentFragment) generate_traceable_node!(DocumentFragment) -generate_cacheable_wrapper_node!(DocumentType, DocumentTypeBinding::Wrap) -generate_binding_object_node!(DocumentType) -generate_traceable_node!(DocumentType) +generate_cacheable_wrapper_node!(DocumentType, DocumentTypeBinding::Wrap) +generate_binding_object_node!(DocumentType) +generate_traceable_node!(DocumentType) generate_cacheable_wrapper!(Text, TextBinding::Wrap) generate_binding_object!(Text) generate_traceable!(Text) diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index f5fdd19db4c..ca433e65693 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -90,7 +90,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject ElementNodeTypeId(HTMLVideoElementTypeId) => generate_element!(HTMLVideoElement), ElementNodeTypeId(HTMLUnknownElementTypeId) => generate_element!(HTMLUnknownElement), CommentNodeTypeId => generate_element!(Comment), - DoctypeNodeTypeId => generate_element!(DocumentType), + DoctypeNodeTypeId => generate_element!(DocumentType), DocumentFragmentNodeTypeId => generate_element!(DocumentFragment), TextNodeTypeId => generate_element!(Text), } diff --git a/src/components/script/dom/documenttype.rs b/src/components/script/dom/documenttype.rs index 976d6e9dd09..97d339f797e 100644 --- a/src/components/script/dom/documenttype.rs +++ b/src/components/script/dom/documenttype.rs @@ -7,22 +7,22 @@ use dom::document::AbstractDocument; use dom::node::{ScriptView, Node, DoctypeNodeTypeId}; /// The `DOCTYPE` tag. -pub struct DocumentType { - node: Node, +pub struct DocumentType { + node: Node, name: ~str, public_id: Option<~str>, system_id: Option<~str>, force_quirks: bool } -impl DocumentType { +impl DocumentType { /// Creates a new `DOCTYPE` tag. pub fn new(name: ~str, public_id: Option<~str>, system_id: Option<~str>, force_quirks: bool, document: AbstractDocument) - -> DocumentType { + -> DocumentType { DocumentType { node: Node::new(DoctypeNodeTypeId, document), name: name, diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index ac0d1e72d35..e58eb306b97 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -273,14 +273,14 @@ impl<'self, View> AbstractNode { self.type_id() == DoctypeNodeTypeId } - pub fn with_imm_doctype(self, f: &fn(&DocumentType) -> R) -> R { + pub fn with_imm_doctype(self, f: &fn(&DocumentType) -> R) -> R { if !self.is_doctype() { fail!(~"node is not doctype"); } self.transmute(f) } - pub fn with_mut_doctype(self, f: &fn(&mut DocumentType) -> R) -> R { + pub fn with_mut_doctype(self, f: &fn(&mut DocumentType) -> R) -> R { if !self.is_doctype() { fail!(~"node is not doctype"); }