Generate bindings for HTMLScriptElement.

9 files changed, 124 insertions, 5 deletions

diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index e42e72e32e3..449297e6808 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -552,6 +552,7 @@ addHTMLElement('HTMLHeadElement')
 addHTMLElement('HTMLHtmlElement')
 addHTMLElement('HTMLImageElement')
 addHTMLElement('HTMLParagraphElement')
+addHTMLElement('HTMLScriptElement')
 addHTMLElement('HTMLSpanElement')
 
 # If you add one of these, you need to make sure nsDOMQS.h has the relevant
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 8cb2d24b52b..047ae86b189 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4621,6 +4621,7 @@ class CGBindingRoot(CGThing):
                           'dom::htmlelement::HTMLElement', #XXXjdm
                           'dom::htmldocument::HTMLDocument', #XXXjdm
                           'dom::htmlimageelement::HTMLImageElement', #XXXjdm
+                          'dom::htmlscriptelement::HTMLScriptElement',
                           'dom::bindings::utils::*',
                           'dom::bindings::conversions::*',
                           'dom::blob::*', #XXXjdm
diff --git a/src/components/script/dom/bindings/codegen/HTMLScriptElement.webidl b/src/components/script/dom/bindings/codegen/HTMLScriptElement.webidl
new file mode 100644
index 00000000000..979e38ca3ad
--- /dev/null
+++ b/src/components/script/dom/bindings/codegen/HTMLScriptElement.webidl
@@ -0,0 +1,35 @@
+/* -*- 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-script-element
+ * http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+ */
+
+interface HTMLScriptElement : HTMLElement {
+  [SetterThrows]
+  attribute DOMString src;
+  [SetterThrows]
+  attribute DOMString type;
+  [SetterThrows]
+  attribute DOMString charset;
+  [SetterThrows]
+  attribute boolean async;
+  [SetterThrows]
+  attribute boolean defer;
+  [SetterThrows]
+  attribute DOMString crossOrigin;
+  [SetterThrows]
+  attribute DOMString text;
+};
+
+// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+partial interface HTMLScriptElement {
+  [SetterThrows]
+  attribute DOMString event;
+  [SetterThrows]
+  attribute DOMString htmlFor;
+};
+
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index 07f284ce36b..96d6de7074d 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -8,11 +8,12 @@ use dom::bindings::utils;
 use dom::bindings::utils::{CacheableWrapper, WrapperCache, DerivedWrapper};
 use dom::element::{HTMLHeadElementTypeId, HTMLHtmlElementTypeId, HTMLAnchorElementTypeId};
 use dom::element::{HTMLDivElementTypeId, HTMLImageElementTypeId, HTMLSpanElementTypeId};
-use dom::element::{HTMLParagraphElementTypeId};
+use dom::element::{HTMLParagraphElementTypeId, HTMLScriptElementTypeId};
 use dom::element::{HTMLHeadElement, HTMLHtmlElement, HTMLDivElement, HTMLSpanElement};
 use dom::element::{HTMLParagraphElement};
 use dom::htmlanchorelement::HTMLAnchorElement;
 use dom::htmlimageelement::HTMLImageElement;
+use dom::htmlscriptelement::HTMLScriptElement;
 use dom::node::{AbstractNode, Node, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId};
 use dom::node::{DoctypeNodeTypeId, ScriptView, Text};
 
@@ -84,6 +85,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
         ElementNodeTypeId(HTMLHtmlElementTypeId) => generate_element!(HTMLHtmlElement),
         ElementNodeTypeId(HTMLImageElementTypeId) => generate_element!(HTMLImageElement),
         ElementNodeTypeId(HTMLParagraphElementTypeId) => generate_element!(HTMLParagraphElement),
+        ElementNodeTypeId(HTMLScriptElementTypeId) => generate_element!(HTMLScriptElement),
         ElementNodeTypeId(HTMLSpanElementTypeId) => generate_element!(HTMLSpanElement),
         ElementNodeTypeId(_) => element::create(cx, node).ptr,
         CommentNodeTypeId |
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index cee10d6c6d7..8dc07744412 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, ..37]);
+    let protoArray = @mut ([0 as *JSObject, ..38]);
     assert!(protoArray.len() == PrototypeList::id::_ID_Count as uint);
     unsafe {
         //XXXjdm we should be storing the box pointer instead of the inner
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index bda07bb4453..e99488aeff3 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -6,7 +6,7 @@
 
 use dom::bindings::codegen::{HTMLHeadElementBinding, HTMLHtmlElementBinding};
 use dom::bindings::codegen::{HTMLAnchorElementBinding, HTMLDivElementBinding, HTMLSpanElementBinding};
-use dom::bindings::codegen::{HTMLParagraphElementBinding};
+use dom::bindings::codegen::{HTMLParagraphElementBinding, HTMLScriptElementBinding};
 use dom::bindings::codegen::{HTMLImageElementBinding};
 use dom::bindings::utils::{DOMString, null_string, ErrorResult};
 use dom::bindings::utils::{CacheableWrapper, BindingObject, WrapperCache};
@@ -16,6 +16,7 @@ use dom::htmlanchorelement::HTMLAnchorElement;
 use dom::htmlcollection::HTMLCollection;
 use dom::htmlelement::HTMLElement;
 use dom::htmlimageelement::HTMLImageElement;
+use dom::htmlscriptelement::HTMLScriptElement;
 use dom::node::{ElementNodeTypeId, Node, ScriptView, AbstractNode};
 use layout_interface::{ContentBoxQuery, ContentBoxResponse, ContentBoxesQuery};
 use layout_interface::{ContentBoxesResponse};
@@ -116,7 +117,6 @@ pub struct HTMLMetaElement      { parent: HTMLElement }
 pub struct HTMLOListElement     { parent: HTMLElement }
 pub struct HTMLOptionElement    { parent: HTMLElement }
 pub struct HTMLParagraphElement { parent: HTMLElement }
-pub struct HTMLScriptElement    { parent: HTMLElement }
 pub struct HTMLSectionElement   { parent: HTMLElement }
 pub struct HTMLSelectElement    { parent: HTMLElement }
 pub struct HTMLSmallElement     { parent: HTMLElement }
@@ -194,6 +194,8 @@ generate_cacheable_wrapper!(HTMLImageElement, HTMLImageElementBinding::Wrap)
 generate_binding_object!(HTMLImageElement)
 generate_cacheable_wrapper!(HTMLParagraphElement, HTMLParagraphElementBinding::Wrap)
 generate_binding_object!(HTMLParagraphElement)
+generate_cacheable_wrapper!(HTMLScriptElement, HTMLScriptElementBinding::Wrap)
+generate_binding_object!(HTMLScriptElement)
 generate_cacheable_wrapper!(HTMLSpanElement, HTMLSpanElementBinding::Wrap)
 generate_binding_object!(HTMLSpanElement)
 
diff --git a/src/components/script/dom/htmlscriptelement.rs b/src/components/script/dom/htmlscriptelement.rs
new file mode 100644
index 00000000000..9556955eabe
--- /dev/null
+++ b/src/components/script/dom/htmlscriptelement.rs
@@ -0,0 +1,75 @@
+/* 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::bindings::utils::{DOMString, null_string, ErrorResult};
+use dom::htmlelement::HTMLElement;
+
+pub struct HTMLScriptElement {
+    parent: HTMLElement,
+}
+
+impl HTMLScriptElement {
+    pub fn Src(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn SetSrc(&mut self, _src: &DOMString, _rv: &mut ErrorResult) {
+    }
+
+    pub fn Type(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn SetType(&mut self, _type: &DOMString, _rv: &mut ErrorResult) {
+    }
+
+    pub fn Charset(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn SetCharset(&mut self, _charset: &DOMString, _rv: &mut ErrorResult) {
+    }
+
+    pub fn Async(&self) -> bool {
+        false
+    }
+
+    pub fn SetAsync(&self, _async: bool, _rv: &mut ErrorResult) {
+    }
+
+    pub fn Defer(&self) -> bool {
+        false
+    }
+
+    pub fn SetDefer(&self, _defer: bool, _rv: &mut ErrorResult) {
+    }
+
+    pub fn CrossOrigin(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn SetCrossOrigin(&mut self, _cross_origin: &DOMString, _rv: &mut ErrorResult) {
+    }
+
+    pub fn Text(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn SetText(&mut self, _text: &DOMString, _rv: &mut ErrorResult) {
+    }
+
+    pub fn Event(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn SetEvent(&mut self, _event: &DOMString, _rv: &mut ErrorResult) {
+    }
+
+    pub fn HtmlFor(&self) -> DOMString {
+        null_string
+    }
+
+    pub fn SetHtmlFor(&mut self, _html_for: &DOMString, _rv: &mut ErrorResult) {
+    }
+}
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index cd2b5ee028c..901828522bd 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -21,7 +21,7 @@ use dom::element::{HTMLAsideElement, HTMLBRElement, HTMLBodyElement,
                    HTMLInputElement, HTMLIframeElement,
                    HTMLItalicElement, HTMLLinkElement, HTMLListItemElement, HTMLMetaElement,
                    HTMLOListElement, HTMLOptionElement, HTMLParagraphElement,
-                   HTMLScriptElement, HTMLSectionElement, HTMLSelectElement, HTMLSmallElement,
+                   HTMLSectionElement, HTMLSelectElement, HTMLSmallElement,
                    HTMLSpanElement, HTMLStyleElement, HTMLTableBodyElement,
                    HTMLTableCellElement, HTMLTableElement, HTMLTableRowElement,
                    HTMLTitleElement, HTMLUListElement};
@@ -29,6 +29,7 @@ use dom::element::{HTMLHeadingElementTypeId, Heading1, Heading2, Heading3, Headi
                    Heading6};
 use dom::htmlanchorelement::HTMLAnchorElement;
 use dom::htmlimageelement::HTMLImageElement;
+use dom::htmlscriptelement::HTMLScriptElement;
 use dom::element::{Element, Attr};
 use dom::htmlelement::HTMLElement;
 use dom::node::{AbstractNode, Comment, Doctype, ElementNodeTypeId, Node, ScriptView};
diff --git a/src/components/script/script.rc b/src/components/script/script.rc
index c8efc458117..e903622ee4d 100644
--- a/src/components/script/script.rc
+++ b/src/components/script/script.rc
@@ -51,6 +51,7 @@ pub mod dom {
             pub mod HTMLHtmlElementBinding;
             pub mod HTMLImageElementBinding;
             pub mod HTMLParagraphElementBinding;
+            pub mod HTMLScriptElementBinding;
             pub mod HTMLSpanElementBinding;
             pub mod MouseEventBinding;
             pub mod NodeBinding;
@@ -77,6 +78,7 @@ pub mod dom {
     pub mod htmldocument;
     pub mod htmlelement;
     pub mod htmlimageelement;
+    pub mod htmlscriptelement;
     pub mod mouseevent;
     pub mod node;
     pub mod uievent;