auto merge of #698 : jdm/servo/elements, r=jdm

Rebased from #694.

7 files changed, 128 insertions, 3 deletions

diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index 01c1ec88f42..2feea771e5d 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -554,10 +554,13 @@ addHTMLElement('HTMLHtmlElement')
 addHTMLElement('HTMLHRElement')
 addHTMLElement('HTMLIFrameElement')
 addHTMLElement('HTMLImageElement')
+addHTMLElement('HTMLMetaElement')
 addHTMLElement('HTMLOListElement')
 addHTMLElement('HTMLParagraphElement')
 addHTMLElement('HTMLScriptElement')
 addHTMLElement('HTMLSpanElement')
+addHTMLElement('HTMLStyleElement')
+addHTMLElement('HTMLTableElement')
 
 # If you add one of these, you need to make sure nsDOMQS.h has the relevant
 # macros added for it
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 9a2fa981e60..c9df70b276b 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4624,8 +4624,11 @@ class CGBindingRoot(CGThing):
                           'dom::htmlhrelement::HTMLHRElement',
                           'dom::htmliframeelement::HTMLIFrameElement', #XXXjdm
                           'dom::htmlimageelement::HTMLImageElement', #XXXjdm
+                          'dom::htmlmetaelement::HTMLMetaElement',
                           'dom::htmlolistelement::HTMLOListElement',
                           'dom::htmlscriptelement::HTMLScriptElement',
+                          'dom::htmlstyleelement::HTMLStyleElement',
+                          'dom::htmltableelement::HTMLTableElement',
                           'dom::bindings::utils::*',
                           'dom::bindings::conversions::*',
                           'dom::blob::*', #XXXjdm
diff --git a/src/components/script/dom/bindings/codegen/HTMLMetaElement.webidl b/src/components/script/dom/bindings/codegen/HTMLMetaElement.webidl
new file mode 100644
index 00000000000..5b7b0f92c24
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/HTMLMetaElement.webidl
@@ -0,0 +1,28 @@
+/* -*- 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-meta-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-meta-element
+interface HTMLMetaElement : HTMLElement {
+  [SetterThrows, Pure]
+           attribute DOMString name;
+  [SetterThrows, Pure]
+           attribute DOMString httpEquiv;
+  [SetterThrows, Pure]
+           attribute DOMString content;
+};
+
+// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+partial interface HTMLMetaElement {
+  [SetterThrows, Pure]
+           attribute DOMString scheme;
+};
diff --git a/src/components/script/dom/bindings/codegen/HTMLStyleElement.webidl b/src/components/script/dom/bindings/codegen/HTMLStyleElement.webidl
new file mode 100644
index 00000000000..7da0a413e00
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/HTMLStyleElement.webidl
@@ -0,0 +1,23 @@
+/* -*- 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-style-element
+ * http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+ */
+
+interface HTMLStyleElement : HTMLElement {
+           [Pure]
+           attribute boolean disabled;
+           [SetterThrows, Pure]
+           attribute DOMString media;
+           [SetterThrows, Pure]
+           attribute DOMString type;
+           [SetterThrows, Pure]
+           attribute boolean scoped;
+};
+// TODO:
+// HTMLStyleElement implements LinkStyle;
+
diff --git a/src/components/script/dom/bindings/codegen/HTMLTableElement.webidl b/src/components/script/dom/bindings/codegen/HTMLTableElement.webidl
new file mode 100644
index 00000000000..9cc655a56d6
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/HTMLTableElement.webidl
@@ -0,0 +1,62 @@
+/* -*- 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/
+ *
+ * © 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.
+ */
+
+interface HTMLTableElement : HTMLElement {
+  /*
+           attribute HTMLTableCaptionElement? caption;
+  HTMLElement createCaption();
+  */
+  void deleteCaption();
+  /*
+           [SetterThrows]
+           attribute HTMLTableSectionElement? tHead;
+  HTMLElement createTHead();
+  */
+  void deleteTHead();
+  /*
+           [SetterThrows]
+           attribute HTMLTableSectionElement? tFoot;
+  HTMLElement createTFoot();
+  */
+  void deleteTFoot();
+  /*
+  readonly attribute HTMLCollection tBodies;
+  HTMLElement createTBody();
+  readonly attribute HTMLCollection rows;
+  [Throws]
+  HTMLElement insertRow(optional long index = -1);
+  */
+  [Throws]
+  void deleteRow(long index);
+           attribute boolean sortable;
+  void stopSorting();
+};
+
+partial interface HTMLTableElement {
+           [SetterThrows]
+           attribute DOMString align;
+           [SetterThrows]
+           attribute DOMString border;
+           [SetterThrows]
+           attribute DOMString frame;
+           [SetterThrows]
+           attribute DOMString rules;
+           [SetterThrows]
+           attribute DOMString summary;
+           [SetterThrows]
+           attribute DOMString width;
+
+  [TreatNullAs=EmptyString, SetterThrows] attribute DOMString bgColor;
+  [TreatNullAs=EmptyString, SetterThrows] attribute DOMString cellPadding;
+  [TreatNullAs=EmptyString, SetterThrows] attribute DOMString cellSpacing;
+};
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index c6c5e47f975..5b5d26c5ec1 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -9,8 +9,8 @@ use dom::bindings::utils::{CacheableWrapper, WrapperCache, DerivedWrapper};
 use dom::element::{HTMLHeadElementTypeId, HTMLHtmlElementTypeId, HTMLAnchorElementTypeId};
 use dom::element::{HTMLDivElementTypeId, HTMLImageElementTypeId, HTMLSpanElementTypeId};
 use dom::element::{HTMLBodyElementTypeId, HTMLHRElementTypeId, HTMLIframeElementTypeId};
-use dom::element::{HTMLParagraphElementTypeId, HTMLScriptElementTypeId};
-use dom::element::{HTMLOListElementTypeId};
+use dom::element::{HTMLParagraphElementTypeId, HTMLScriptElementTypeId, HTMLMetaElementTypeId};
+use dom::element::{HTMLOListElementTypeId, HTMLStyleElementTypeId, HTMLTableElementTypeId};
 use dom::element::{HTMLHeadElement, HTMLHtmlElement, HTMLDivElement, HTMLSpanElement};
 use dom::element::{HTMLParagraphElement};
 use dom::htmlanchorelement::HTMLAnchorElement;
@@ -18,8 +18,11 @@ use dom::htmlbodyelement::HTMLBodyElement;
 use dom::htmlhrelement::HTMLHRElement;
 use dom::htmliframeelement::HTMLIFrameElement;
 use dom::htmlimageelement::HTMLImageElement;
+use dom::htmlmetaelement::HTMLMetaElement;
 use dom::htmlolistelement::HTMLOListElement;
 use dom::htmlscriptelement::HTMLScriptElement;
+use dom::htmlstyleelement::HTMLStyleElement;
+use dom::htmltableelement::HTMLTableElement;
 use dom::node::{AbstractNode, Node, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId};
 use dom::node::{DoctypeNodeTypeId, ScriptView, Text};
 
@@ -93,10 +96,13 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
         ElementNodeTypeId(HTMLHtmlElementTypeId) => generate_element!(HTMLHtmlElement),
         ElementNodeTypeId(HTMLIframeElementTypeId) => generate_element!(HTMLIFrameElement),
         ElementNodeTypeId(HTMLImageElementTypeId) => generate_element!(HTMLImageElement),
+        ElementNodeTypeId(HTMLMetaElementTypeId) => generate_element!(HTMLMetaElement),
         ElementNodeTypeId(HTMLOListElementTypeId) => generate_element!(HTMLOListElement),
         ElementNodeTypeId(HTMLParagraphElementTypeId) => generate_element!(HTMLParagraphElement),
         ElementNodeTypeId(HTMLScriptElementTypeId) => generate_element!(HTMLScriptElement),
         ElementNodeTypeId(HTMLSpanElementTypeId) => generate_element!(HTMLSpanElement),
+        ElementNodeTypeId(HTMLStyleElementTypeId) => generate_element!(HTMLStyleElement),
+        ElementNodeTypeId(HTMLTableElementTypeId) => generate_element!(HTMLTableElement),
         ElementNodeTypeId(_) => element::create(cx, node).ptr,
         CommentNodeTypeId |
         DoctypeNodeTypeId => text::create(cx, node).ptr,
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index a85e6bbc41e..5943a03f738 100644
--- a/src/components/script/dom/bindings/utils.rs
+++ b/src/components/script/dom/bindings/utils.rs
@@ -617,7 +617,7 @@ pub extern fn ThrowingConstructor(_cx: *JSContext, _argc: uint, _vp: *JSVal) ->
 }
 
 pub fn initialize_global(global: *JSObject) {
-    let protoArray = @mut ([0 as *JSObject, ..42]);
+    let protoArray = @mut ([0 as *JSObject, ..45]);
     assert!(protoArray.len() == PrototypeList::id::_ID_Count as uint);
     unsafe {
         //XXXjdm we should be storing the box pointer instead of the inner