aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2013-11-01 22:02:32 +0100
committerMs2ger <ms2ger@gmail.com>2013-11-01 22:02:32 +0100
commitb20461f25365f8b90d241489cfe115b71eca9bcf (patch)
tree47967f7e1abd053e049833e3f8650296a83d9e6b
parent9fbc45ae9cd90aaf0bed45ad47188c887f7ceb0e (diff)
downloadservo-b20461f25365f8b90d241489cfe115b71eca9bcf.tar.gz
servo-b20461f25365f8b90d241489cfe115b71eca9bcf.zip
Introduce HTMLObjectElement::new.
-rw-r--r--src/components/script/dom/htmlobjectelement.rs17
-rw-r--r--src/components/script/html/hubbub_html_parser.rs2
2 files changed, 17 insertions, 2 deletions
diff --git a/src/components/script/dom/htmlobjectelement.rs b/src/components/script/dom/htmlobjectelement.rs
index 7591b1c5180..da31fdd73c6 100644
--- a/src/components/script/dom/htmlobjectelement.rs
+++ b/src/components/script/dom/htmlobjectelement.rs
@@ -2,10 +2,12 @@
* 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::codegen::HTMLObjectElementBinding;
use dom::bindings::utils::{DOMString, ErrorResult};
use dom::document::AbstractDocument;
+use dom::element::HTMLObjectElementTypeId;
use dom::htmlelement::HTMLElement;
-use dom::node::{AbstractNode, ScriptView};
+use dom::node::{AbstractNode, Node, ScriptView};
use dom::validitystate::ValidityState;
use dom::windowproxy::WindowProxy;
@@ -14,6 +16,19 @@ pub struct HTMLObjectElement {
}
impl HTMLObjectElement {
+ pub fn new_inherited(localName: ~str, document: AbstractDocument) -> HTMLObjectElement {
+ HTMLObjectElement {
+ htmlelement: HTMLElement::new(HTMLObjectElementTypeId, localName, document)
+ }
+ }
+
+ pub fn new(localName: ~str, document: AbstractDocument) -> AbstractNode<ScriptView> {
+ let element = HTMLObjectElement::new_inherited(localName, document);
+ Node::reflect_node(@mut element, document, HTMLObjectElementBinding::Wrap)
+ }
+}
+
+impl HTMLObjectElement {
pub fn Data(&self) -> DOMString {
None
}
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 8ababab95d5..2a0632dcce2 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -241,7 +241,6 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum
handle_element!(cx, document, tag, "meta", HTMLMetaElementTypeId, HTMLMetaElement, []);
handle_element!(cx, document, tag, "meter", HTMLMeterElementTypeId, HTMLMeterElement, []);
handle_element!(cx, document, tag, "mod", HTMLModElementTypeId, HTMLModElement, []);
- handle_element!(cx, document, tag, "object", HTMLObjectElementTypeId, HTMLObjectElement, []);
handle_htmlelement!(cx, document, tag, "aside", HTMLElementTypeId, HTMLElement);
handle_htmlelement!(cx, document, tag, "b", HTMLElementTypeId, HTMLElement);
@@ -261,6 +260,7 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum
handle_newable_element!(document, tag, "h6", HTMLHeadingElement, Heading6);
handle_newable_element!(document, tag, "iframe", HTMLIFrameElement);
handle_newable_element!(document, tag, "img", HTMLImageElement);
+ handle_newable_element!(document, tag, "object", HTMLObjectElement);
handle_newable_element!(document, tag, "ol", HTMLOListElement);
handle_newable_element!(document, tag, "optgroup", HTMLOptGroupElement);
handle_newable_element!(document, tag, "option", HTMLOptionElement);