Remove View type parameter from DocumentType

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<ScriptView>')
+addHTMLElement('DocumentType')
 addHTMLElement('Text')
 
 addHTMLElement('HTMLAnchorElement')

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<ScriptView>, DocumentTypeBinding::Wrap)
+generate_cacheable_wrapper_node!(DocumentType, DocumentTypeBinding::Wrap)
-generate_binding_object_node!(DocumentType<ScriptView>)
+generate_binding_object_node!(DocumentType)
-generate_traceable_node!(DocumentType<ScriptView>)
+generate_traceable_node!(DocumentType)
 generate_cacheable_wrapper!(Text, TextBinding::Wrap)
 generate_binding_object!(Text)
 generate_traceable!(Text)

src/components/script/dom/bindings/node.rs

@@ -90,7 +90,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
         ElementNodeTypeId(HTMLVideoElementTypeId) => generate_element!(HTMLVideoElement),
         ElementNodeTypeId(HTMLUnknownElementTypeId) => generate_element!(HTMLUnknownElement),
         CommentNodeTypeId => generate_element!(Comment),
-        DoctypeNodeTypeId => generate_element!(DocumentType<ScriptView>),
+        DoctypeNodeTypeId => generate_element!(DocumentType),
         DocumentFragmentNodeTypeId => generate_element!(DocumentFragment),
         TextNodeTypeId => generate_element!(Text),
     }

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<View> {
+pub struct DocumentType {
-    node: Node<View>,
+    node: Node<ScriptView>,
     name: ~str,
     public_id: Option<~str>,
     system_id: Option<~str>,
     force_quirks: bool
 }
 
-impl DocumentType<ScriptView> {
+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<ScriptView> {
+            -> DocumentType {
         DocumentType {
             node: Node::new(DoctypeNodeTypeId, document),
             name: name,

src/components/script/dom/node.rs

@@ -273,14 +273,14 @@ impl<'self, View> AbstractNode<View> {
         self.type_id() == DoctypeNodeTypeId
     }
 
-    pub fn with_imm_doctype<R>(self, f: &fn(&DocumentType<View>) -> R) -> R {
+    pub fn with_imm_doctype<R>(self, f: &fn(&DocumentType) -> R) -> R {
         if !self.is_doctype() {
             fail!(~"node is not doctype");
         }
         self.transmute(f)
     }
 
-    pub fn with_mut_doctype<R>(self, f: &fn(&mut DocumentType<View>) -> R) -> R {
+    pub fn with_mut_doctype<R>(self, f: &fn(&mut DocumentType) -> R) -> R {
         if !self.is_doctype() {
             fail!(~"node is not doctype");
         }