Generate HTMLHtmlElement bindings.

6 files changed, 79 insertions, 28 deletions

diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index a5d76bcd8d4..b4a0da9ffac 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -229,16 +229,6 @@ DOMInterfaces = {
     'pointerType': '',
 },
 
-'HTMLElement': {
-    'nativeType': 'AbstractNode<ScriptView>',
-    'pointerType': ''
-},
-
-'HTMLHeadElement': {
-    'nativeType': 'AbstractNode<ScriptView>',
-    'pointerType': ''
-},
-
 'HTMLOptionsCollection': [
 {
     'nativeType': 'nsHTMLOptionCollection',
@@ -548,6 +538,16 @@ def addExternalIface(iface, nativeType=None, headerFile=None, pointerType=None):
         domInterface['pointerType'] = pointerType
     DOMInterfaces[iface] = domInterface
 
+def addHTMLElement(element):
+  DOMInterfaces[element] = {
+    'nativeType': 'AbstractNode<ScriptView>',
+    'pointerType': ''
+  }
+
+addHTMLElement('HTMLElement')
+addHTMLElement('HTMLHeadElement')
+addHTMLElement('HTMLHtmlElement')
+
 # If you add one of these, you need to make sure nsDOMQS.h has the relevant
 # macros added for it
 def addExternalHTMLElement(element):
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index f8c4bc0ff4f..adfcf231448 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4605,7 +4605,7 @@ class CGBindingRoot(CGThing):
                           'dom::characterdata::CharacterData', #XXXjdm
                           'dom::node::{AbstractNode, Node, Text}', #XXXjdm
                           'dom::document::{Document, AbstractDocument}', #XXXjdm
-                          'dom::element::{Element, HTMLHeadElement}', #XXXjdm
+                          'dom::element::{Element, HTMLHeadElement, HTMLHtmlElement}', #XXXjdm
                           'dom::htmlelement::HTMLElement', #XXXjdm
                           'dom::htmldocument::HTMLDocument', #XXXjdm
                           'dom::bindings::utils::*',
diff --git a/src/components/script/dom/bindings/codegen/HTMLHtmlElement.webidl b/src/components/script/dom/bindings/codegen/HTMLHtmlElement.webidl
new file mode 100644
index 00000000000..b06de776192
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/HTMLHtmlElement.webidl
@@ -0,0 +1,22 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/.
+ *
+ * The origin of this IDL file is
+ * http://www.whatwg.org/specs/web-apps/current-work/#the-html-element
+ * http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+ *
+ * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
+ * Opera Software ASA. You are granted a license to use, reproduce
+ * and create derivative works of this document.
+ */
+
+// http://www.whatwg.org/specs/web-apps/current-work/#the-html-element
+interface HTMLHtmlElement : HTMLElement {};
+
+// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+partial interface HTMLHtmlElement {
+           [SetterThrows, Pure]
+           attribute DOMString version;
+};
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index 6ca2e61d6aa..a8e5b78e7e8 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -6,7 +6,8 @@ use dom::bindings::element;
 use dom::bindings::text;
 use dom::bindings::utils;
 use dom::bindings::utils::{CacheableWrapper, WrapperCache, DerivedWrapper};
-use dom::element::{HTMLHeadElementTypeId, HTMLHeadElement};
+use dom::element::{HTMLHeadElementTypeId, HTMLHtmlElementTypeId};
+use dom::element::{HTMLHeadElement, HTMLHtmlElement};
 use dom::node::{AbstractNode, Node, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId};
 use dom::node::{DoctypeNodeTypeId, ScriptView, Text};
 
@@ -62,13 +63,18 @@ pub fn init(compartment: @mut Compartment) {
     }
 }
 
+macro_rules! generate_element(
+    ($name: ident) => ({
+        let node: @mut $name = unsafe { cast::transmute(node.raw_object()) };
+        node.wrap_object_shared(cx, ptr::null())
+    })
+)
+
 #[allow(non_implicitly_copyable_typarams)]
 pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject {
     match node.type_id() {
-        ElementNodeTypeId(HTMLHeadElementTypeId) => {
-            let node: @mut HTMLHeadElement = unsafe { cast::transmute(node.raw_object()) };
-            node.wrap_object_shared(cx, ptr::null())
-        }
+        ElementNodeTypeId(HTMLHeadElementTypeId) => generate_element!(HTMLHeadElement),
+        ElementNodeTypeId(HTMLHtmlElementTypeId) => generate_element!(HTMLHtmlElement),
         ElementNodeTypeId(_) => element::create(cx, node).ptr,
         CommentNodeTypeId |
         DoctypeNodeTypeId => text::create(cx, node).ptr,
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index ec412ade152..4919aa64f63 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -4,7 +4,7 @@
 
 //! Element nodes.
 
-use dom::bindings::codegen::HTMLHeadElementBinding;
+use dom::bindings::codegen::{HTMLHeadElementBinding, HTMLHtmlElementBinding};
 use dom::bindings::utils::{DOMString, null_string, ErrorResult};
 use dom::bindings::utils::{CacheableWrapper, BindingObject, WrapperCache};
 use dom::clientrect::ClientRect;
@@ -124,22 +124,44 @@ pub struct HTMLTitleElement     { parent: HTMLElement }
 pub struct HTMLUListElement     { parent: HTMLElement }
 pub struct UnknownElement       { parent: HTMLElement }
 
-impl CacheableWrapper for HTMLHeadElement {
-    fn get_wrappercache(&mut self) -> &mut WrapperCache {
-        self.parent.get_wrappercache()
+impl HTMLHtmlElement {
+    pub fn Version(&self) -> DOMString {
+        null_string
     }
 
-    fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
-        let mut unused = false;
-        HTMLHeadElementBinding::Wrap(cx, scope, self, &mut unused)
+    pub fn SetVersion(&mut self, _version: &DOMString, _rv: &mut ErrorResult) {
     }
 }
 
-impl BindingObject for HTMLHeadElement {
-    fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> {
-        self.parent.GetParentObject(cx)
-    }
-}
+macro_rules! generate_cacheable_wrapper(
+    ($name: ident, $wrap: path) => (
+        impl CacheableWrapper for $name {
+            fn get_wrappercache(&mut self) -> &mut WrapperCache {
+                self.parent.get_wrappercache()
+            }
+
+            fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
+                let mut unused = false;
+                $wrap(cx, scope, self, &mut unused)
+            }
+        }
+    )
+)
+
+macro_rules! generate_binding_object(
+    ($name: ident) => (
+        impl BindingObject for $name {
+            fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> {
+                self.parent.GetParentObject(cx)
+            }
+        }
+    )
+)
+
+generate_cacheable_wrapper!(HTMLHeadElement, HTMLHeadElementBinding::Wrap)
+generate_binding_object!(HTMLHeadElement)
+generate_cacheable_wrapper!(HTMLHtmlElement, HTMLHtmlElementBinding::Wrap)
+generate_binding_object!(HTMLHtmlElement)
 
 //
 // Fancier elements
diff --git a/src/components/script/script.rc b/src/components/script/script.rc
index b2acc25b5c4..684f378cf9b 100644
--- a/src/components/script/script.rc
+++ b/src/components/script/script.rc
@@ -46,6 +46,7 @@ pub mod dom {
             pub mod HTMLDocumentBinding;
             pub mod HTMLElementBinding;
             pub mod HTMLHeadElementBinding;
+            pub mod HTMLHtmlElementBinding;
             pub mod MouseEventBinding;
             pub mod NodeBinding;
             pub mod PrototypeList;