auto merge of #1091 : marcoscaceres/servo/master, r=jdm

src/components/script/dom/bindings/codegen/Bindings.conf

@@ -611,6 +611,7 @@ addHTMLElement('HTMLLegendElement')
 addHTMLElement('HTMLLIElement')
 addHTMLElement('HTMLLinkElement')
 addHTMLElement('HTMLMapElement')
+addHTMLElement('HTMLMainElement')
 addHTMLElement('HTMLMediaElement')
 addHTMLElement('HTMLMetaElement')
 addHTMLElement('HTMLMeterElement')

src/components/script/dom/bindings/codegen/HTMLMainElement.webidl

@@ -0,0 +1,14 @@
+/* -*- 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 HTMLMainElement : HTMLElement {};

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

@@ -209,6 +209,9 @@ generate_traceable_htmlelement!(HTMLLIElement)
 generate_cacheable_wrapper_htmlelement!(HTMLLinkElement, HTMLLinkElementBinding::Wrap)
 generate_traceable_htmlelement!(HTMLLinkElement)
 
+generate_cacheable_wrapper_htmlelement!(HTMLMainElement, HTMLMainElementBinding::Wrap)
+generate_traceable_htmlelement!(HTMLMainElement)
+
 generate_cacheable_wrapper_htmlelement!(HTMLMapElement, HTMLMapElementBinding::Wrap)
 generate_traceable_htmlelement!(HTMLMapElement)
 

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

@@ -55,6 +55,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
         ElementNodeTypeId(HTMLLegendElementTypeId) => generate_element!(HTMLLegendElement),
         ElementNodeTypeId(HTMLLIElementTypeId) => generate_element!(HTMLLIElement),
         ElementNodeTypeId(HTMLLinkElementTypeId) => generate_element!(HTMLLinkElement),
+        ElementNodeTypeId(HTMLMainElementTypeId) => generate_element!(HTMLMainElement),
         ElementNodeTypeId(HTMLMapElementTypeId) => generate_element!(HTMLMapElement),
         ElementNodeTypeId(HTMLMediaElementTypeId) => generate_element!(HTMLMediaElement),
         ElementNodeTypeId(HTMLMetaElementTypeId) => generate_element!(HTMLMetaElement),

src/components/script/dom/element.rs

@@ -82,6 +82,7 @@ pub enum ElementTypeId {
     HTMLLegendElementTypeId,
     HTMLLinkElementTypeId,
     HTMLLIElementTypeId,
+    HTMLMainElementTypeId,
     HTMLMapElementTypeId,
     HTMLMediaElementTypeId,
     HTMLMetaElementTypeId,

src/components/script/dom/htmlmainelement.rs

@@ -0,0 +1,9 @@
+/* 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/. */
+
+use dom::htmlelement::HTMLElement;
+
+pub struct HTMLMainElement {
+    htmlelement: HTMLElement
+}