From bc61e0348ebd44a9ebd20faeae48814f463447d5 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 1 Nov 2013 21:39:55 +0100 Subject: [PATCH] Introduce HTMLOutputElement::new. --- src/components/script/dom/htmloutputelement.rs | 18 +++++++++++++++++- .../script/html/hubbub_html_parser.rs | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/script/dom/htmloutputelement.rs b/src/components/script/dom/htmloutputelement.rs index b3f0f80a0fe..d006eb7e97f 100644 --- a/src/components/script/dom/htmloutputelement.rs +++ b/src/components/script/dom/htmloutputelement.rs @@ -2,15 +2,31 @@ * 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::HTMLOutputElementBinding; use dom::bindings::utils::{DOMString, ErrorResult}; +use dom::document::AbstractDocument; +use dom::element::HTMLOutputElementTypeId; use dom::htmlelement::HTMLElement; -use dom::node::{AbstractNode, ScriptView}; +use dom::node::{AbstractNode, Node, ScriptView}; use dom::validitystate::ValidityState; pub struct HTMLOutputElement { htmlelement: HTMLElement } +impl HTMLOutputElement { + pub fn new_inherited(localName: ~str, document: AbstractDocument) -> HTMLOutputElement { + HTMLOutputElement { + htmlelement: HTMLElement::new(HTMLOutputElementTypeId, localName, document) + } + } + + pub fn new(localName: ~str, document: AbstractDocument) -> AbstractNode { + let element = HTMLOutputElement::new_inherited(localName, document); + Node::reflect_node(@mut element, document, HTMLOutputElementBinding::Wrap) + } +} + impl HTMLOutputElement { pub fn GetForm(&self) -> Option> { None diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index b1f8cc96484..e6c6e68ba30 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -245,7 +245,6 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum handle_element!(cx, document, tag, "ol", HTMLOListElementTypeId, HTMLOListElement, []); handle_element!(cx, document, tag, "option", HTMLOptionElementTypeId, HTMLOptionElement, []); handle_element!(cx, document, tag, "optgroup",HTMLOptGroupElementTypeId, HTMLOptGroupElement, []); - handle_element!(cx, document, tag, "output", HTMLOutputElementTypeId, HTMLOutputElement, []); handle_htmlelement!(cx, document, tag, "aside", HTMLElementTypeId, HTMLElement); handle_htmlelement!(cx, document, tag, "b", HTMLElementTypeId, HTMLElement); @@ -265,6 +264,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, "output", HTMLOutputElement); handle_newable_element!(document, tag, "p", HTMLParagraphElement); handle_newable_element!(document, tag, "param", HTMLParamElement); handle_newable_element!(document, tag, "pre", HTMLPreElement);