From 17542ee14c300e908753a3e6cfc614d64e23d38d Mon Sep 17 00:00:00 2001 From: saneyuki_s Date: Wed, 7 Aug 2013 21:09:11 +0900 Subject: [PATCH 1/3] Generate bindings for HTMLParagraphElement. --- .../script/dom/bindings/codegen/Bindings.conf | 1 + .../dom/bindings/codegen/CodegenRust.py | 2 +- .../codegen/HTMLParagraphElement.webidl | 22 +++++++++++++++++++ src/components/script/dom/bindings/node.rs | 3 +++ src/components/script/dom/bindings/utils.rs | 2 +- src/components/script/dom/element.rs | 13 +++++++++++ src/components/script/script.rc | 1 + 7 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/components/script/dom/bindings/codegen/HTMLParagraphElement.webidl diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index 57877d06491..e42e72e32e3 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -551,6 +551,7 @@ addHTMLElement('HTMLElement') addHTMLElement('HTMLHeadElement') addHTMLElement('HTMLHtmlElement') addHTMLElement('HTMLImageElement') +addHTMLElement('HTMLParagraphElement') 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 9f8b319e80e..8cb2d24b52b 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -4616,7 +4616,7 @@ class CGBindingRoot(CGThing): 'dom::node::{AbstractNode, Node, Text}', #XXXjdm 'dom::document::{Document, AbstractDocument}', #XXXjdm 'dom::element::{Element, HTMLHeadElement, HTMLHtmlElement}', #XXXjdm - 'dom::element::{HTMLDivElement, HTMLSpanElement}', #XXXjdm + 'dom::element::{HTMLDivElement, HTMLSpanElement, HTMLParagraphElement}', #XXXjdm 'dom::htmlanchorelement::HTMLAnchorElement', #XXXjdm 'dom::htmlelement::HTMLElement', #XXXjdm 'dom::htmldocument::HTMLDocument', #XXXjdm diff --git a/src/components/script/dom/bindings/codegen/HTMLParagraphElement.webidl b/src/components/script/dom/bindings/codegen/HTMLParagraphElement.webidl new file mode 100644 index 00000000000..2a626d25750 --- /dev/null +++ b/src/components/script/dom/bindings/codegen/HTMLParagraphElement.webidl @@ -0,0 +1,22 @@ +/* -*- 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-p-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-p-element +interface HTMLParagraphElement : HTMLElement { +}; + +// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis +partial interface HTMLParagraphElement { + [SetterThrows] + attribute DOMString align; +}; diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 76e618e98ca..07f284ce36b 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -8,7 +8,9 @@ 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::{HTMLHeadElement, HTMLHtmlElement, HTMLDivElement, HTMLSpanElement}; +use dom::element::{HTMLParagraphElement}; use dom::htmlanchorelement::HTMLAnchorElement; use dom::htmlimageelement::HTMLImageElement; use dom::node::{AbstractNode, Node, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId}; @@ -81,6 +83,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject ElementNodeTypeId(HTMLHeadElementTypeId) => generate_element!(HTMLHeadElement), ElementNodeTypeId(HTMLHtmlElementTypeId) => generate_element!(HTMLHtmlElement), ElementNodeTypeId(HTMLImageElementTypeId) => generate_element!(HTMLImageElement), + ElementNodeTypeId(HTMLParagraphElementTypeId) => generate_element!(HTMLParagraphElement), 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 15cf1214da6..cee10d6c6d7 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, ..36]); + let protoArray = @mut ([0 as *JSObject, ..37]); 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 6dead4db5ea..bda07bb4453 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -6,6 +6,7 @@ use dom::bindings::codegen::{HTMLHeadElementBinding, HTMLHtmlElementBinding}; use dom::bindings::codegen::{HTMLAnchorElementBinding, HTMLDivElementBinding, HTMLSpanElementBinding}; +use dom::bindings::codegen::{HTMLParagraphElementBinding}; use dom::bindings::codegen::{HTMLImageElementBinding}; use dom::bindings::utils::{DOMString, null_string, ErrorResult}; use dom::bindings::utils::{CacheableWrapper, BindingObject, WrapperCache}; @@ -147,6 +148,15 @@ impl HTMLDivElement { } } +impl HTMLParagraphElement { + pub fn Align(&self) -> DOMString { + null_string + } + + pub fn SetAlign(&mut self, _align: &DOMString, _rv: &mut ErrorResult) { + } +} + pub macro_rules! generate_cacheable_wrapper( ($name: ident, $wrap: path) => ( impl CacheableWrapper for $name { @@ -182,9 +192,12 @@ generate_cacheable_wrapper!(HTMLDivElement, HTMLDivElementBinding::Wrap) generate_binding_object!(HTMLDivElement) generate_cacheable_wrapper!(HTMLImageElement, HTMLImageElementBinding::Wrap) generate_binding_object!(HTMLImageElement) +generate_cacheable_wrapper!(HTMLParagraphElement, HTMLParagraphElementBinding::Wrap) +generate_binding_object!(HTMLParagraphElement) generate_cacheable_wrapper!(HTMLSpanElement, HTMLSpanElementBinding::Wrap) generate_binding_object!(HTMLSpanElement) + // // Fancier elements // diff --git a/src/components/script/script.rc b/src/components/script/script.rc index 5a8357a48b0..c8efc458117 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -50,6 +50,7 @@ pub mod dom { pub mod HTMLHeadElementBinding; pub mod HTMLHtmlElementBinding; pub mod HTMLImageElementBinding; + pub mod HTMLParagraphElementBinding; pub mod HTMLSpanElementBinding; pub mod MouseEventBinding; pub mod NodeBinding; From ac4938b7ddd9b76c60cf51dd33fba23ccdb828f8 Mon Sep 17 00:00:00 2001 From: saneyuki_s Date: Wed, 7 Aug 2013 22:01:00 +0900 Subject: [PATCH 2/3] Generate bindings for HTMLScriptElement. --- .../script/dom/bindings/codegen/Bindings.conf | 1 + .../dom/bindings/codegen/CodegenRust.py | 1 + .../bindings/codegen/HTMLScriptElement.webidl | 35 +++++++++ src/components/script/dom/bindings/node.rs | 4 +- src/components/script/dom/bindings/utils.rs | 2 +- src/components/script/dom/element.rs | 6 +- .../script/dom/htmlscriptelement.rs | 75 +++++++++++++++++++ .../script/html/hubbub_html_parser.rs | 3 +- src/components/script/script.rc | 2 + 9 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 src/components/script/dom/bindings/codegen/HTMLScriptElement.webidl create mode 100644 src/components/script/dom/htmlscriptelement.rs 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) -> *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; From 2e3cd1945cc7f071ce8a3b17febd0f8b404e897c Mon Sep 17 00:00:00 2001 From: saneyuki_s Date: Wed, 7 Aug 2013 22:52:39 +0900 Subject: [PATCH 3/3] Generate bindings for HTMLHRElement. --- .../script/dom/bindings/codegen/Bindings.conf | 1 + .../dom/bindings/codegen/CodegenRust.py | 1 + .../dom/bindings/codegen/HTMLHRElement.webidl | 30 ++++++++++++ src/components/script/dom/bindings/node.rs | 3 ++ src/components/script/dom/bindings/utils.rs | 2 +- src/components/script/dom/element.rs | 5 +- src/components/script/dom/htmlhrelement.rs | 47 +++++++++++++++++++ .../script/html/hubbub_html_parser.rs | 3 +- src/components/script/script.rc | 2 + 9 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 src/components/script/dom/bindings/codegen/HTMLHRElement.webidl create mode 100644 src/components/script/dom/htmlhrelement.rs diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index 449297e6808..8becea9ceec 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -550,6 +550,7 @@ addHTMLElement('HTMLDivElement') addHTMLElement('HTMLElement') addHTMLElement('HTMLHeadElement') addHTMLElement('HTMLHtmlElement') +addHTMLElement('HTMLHRElement') addHTMLElement('HTMLImageElement') addHTMLElement('HTMLParagraphElement') addHTMLElement('HTMLScriptElement') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 047ae86b189..b64ae00afbb 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -4620,6 +4620,7 @@ class CGBindingRoot(CGThing): 'dom::htmlanchorelement::HTMLAnchorElement', #XXXjdm 'dom::htmlelement::HTMLElement', #XXXjdm 'dom::htmldocument::HTMLDocument', #XXXjdm + 'dom::htmlhrelement::HTMLHRElement', 'dom::htmlimageelement::HTMLImageElement', #XXXjdm 'dom::htmlscriptelement::HTMLScriptElement', 'dom::bindings::utils::*', diff --git a/src/components/script/dom/bindings/codegen/HTMLHRElement.webidl b/src/components/script/dom/bindings/codegen/HTMLHRElement.webidl new file mode 100644 index 00000000000..0495e43b314 --- /dev/null +++ b/src/components/script/dom/bindings/codegen/HTMLHRElement.webidl @@ -0,0 +1,30 @@ +/* -*- 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-hr-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-hr-element +interface HTMLHRElement : HTMLElement { +}; + +// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis +partial interface HTMLHRElement { + [SetterThrows] + attribute DOMString align; + [SetterThrows] + attribute DOMString color; + [SetterThrows] + attribute boolean noShade; + [SetterThrows] + attribute DOMString size; + [SetterThrows] + attribute DOMString width; +}; diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 96d6de7074d..710851e724d 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -8,10 +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::{HTMLHRElementTypeId}; use dom::element::{HTMLParagraphElementTypeId, HTMLScriptElementTypeId}; use dom::element::{HTMLHeadElement, HTMLHtmlElement, HTMLDivElement, HTMLSpanElement}; use dom::element::{HTMLParagraphElement}; use dom::htmlanchorelement::HTMLAnchorElement; +use dom::htmlhrelement::HTMLHRElement; use dom::htmlimageelement::HTMLImageElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::node::{AbstractNode, Node, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId}; @@ -82,6 +84,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject ElementNodeTypeId(HTMLAnchorElementTypeId) => generate_element!(HTMLAnchorElement), ElementNodeTypeId(HTMLDivElementTypeId) => generate_element!(HTMLDivElement), ElementNodeTypeId(HTMLHeadElementTypeId) => generate_element!(HTMLHeadElement), + ElementNodeTypeId(HTMLHRElementTypeId) => generate_element!(HTMLHRElement), ElementNodeTypeId(HTMLHtmlElementTypeId) => generate_element!(HTMLHtmlElement), ElementNodeTypeId(HTMLImageElementTypeId) => generate_element!(HTMLImageElement), ElementNodeTypeId(HTMLParagraphElementTypeId) => generate_element!(HTMLParagraphElement), diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 8dc07744412..3b26659922c 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, ..38]); + let protoArray = @mut ([0 as *JSObject, ..39]); 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 e99488aeff3..75b2868491f 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -6,6 +6,7 @@ use dom::bindings::codegen::{HTMLHeadElementBinding, HTMLHtmlElementBinding}; use dom::bindings::codegen::{HTMLAnchorElementBinding, HTMLDivElementBinding, HTMLSpanElementBinding}; +use dom::bindings::codegen::{HTMLHRElementBinding}; use dom::bindings::codegen::{HTMLParagraphElementBinding, HTMLScriptElementBinding}; use dom::bindings::codegen::{HTMLImageElementBinding}; use dom::bindings::utils::{DOMString, null_string, ErrorResult}; @@ -15,6 +16,7 @@ use dom::clientrectlist::ClientRectList; use dom::htmlanchorelement::HTMLAnchorElement; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; +use dom::htmlhrelement::HTMLHRElement; use dom::htmlimageelement::HTMLImageElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::node::{ElementNodeTypeId, Node, ScriptView, AbstractNode}; @@ -106,7 +108,6 @@ pub struct HTMLBoldElement { parent: HTMLElement } pub struct HTMLDivElement { parent: HTMLElement } pub struct HTMLFontElement { parent: HTMLElement } pub struct HTMLFormElement { parent: HTMLElement } -pub struct HTMLHRElement { parent: HTMLElement } pub struct HTMLHeadElement { parent: HTMLElement } pub struct HTMLHtmlElement { parent: HTMLElement } pub struct HTMLInputElement { parent: HTMLElement } @@ -184,6 +185,8 @@ pub macro_rules! generate_binding_object( generate_cacheable_wrapper!(HTMLHeadElement, HTMLHeadElementBinding::Wrap) generate_binding_object!(HTMLHeadElement) +generate_cacheable_wrapper!(HTMLHRElement, HTMLHRElementBinding::Wrap) +generate_binding_object!(HTMLHRElement) generate_cacheable_wrapper!(HTMLHtmlElement, HTMLHtmlElementBinding::Wrap) generate_binding_object!(HTMLHtmlElement) generate_cacheable_wrapper!(HTMLAnchorElement, HTMLAnchorElementBinding::Wrap) diff --git a/src/components/script/dom/htmlhrelement.rs b/src/components/script/dom/htmlhrelement.rs new file mode 100644 index 00000000000..d1a3bb0348e --- /dev/null +++ b/src/components/script/dom/htmlhrelement.rs @@ -0,0 +1,47 @@ +/* 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 HTMLHRElement { + parent: HTMLElement, +} + +impl HTMLHRElement { + pub fn Align(&self) -> DOMString { + null_string + } + + pub fn SetAlign(&mut self, _align: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn Color(&self) -> DOMString { + null_string + } + + pub fn SetColor(&mut self, _color: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn NoShade(&self) -> bool { + false + } + + pub fn SetNoShade(&self, _no_shade: bool, _rv: &mut ErrorResult) { + } + + pub fn Size(&self) -> DOMString { + null_string + } + + pub fn SetSize(&mut self, _size: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn Width(&self) -> DOMString { + null_string + } + + pub fn SetWidth(&mut self, _width: &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 901828522bd..6f16b7229f8 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -17,7 +17,7 @@ use dom::element::{HTMLAnchorElementTypeId, HTMLAsideElementTypeId, HTMLBRElemen UnknownElementTypeId}; use dom::element::{HTMLAsideElement, HTMLBRElement, HTMLBodyElement, HTMLBoldElement, HTMLDivElement, HTMLFontElement, HTMLFormElement, - HTMLHRElement, HTMLHeadElement, HTMLHeadingElement, HTMLHtmlElement, + HTMLHeadElement, HTMLHeadingElement, HTMLHtmlElement, HTMLInputElement, HTMLIframeElement, HTMLItalicElement, HTMLLinkElement, HTMLListItemElement, HTMLMetaElement, HTMLOListElement, HTMLOptionElement, HTMLParagraphElement, @@ -28,6 +28,7 @@ use dom::element::{HTMLAsideElement, HTMLBRElement, HTMLBodyElement, use dom::element::{HTMLHeadingElementTypeId, Heading1, Heading2, Heading3, Heading4, Heading5, Heading6}; use dom::htmlanchorelement::HTMLAnchorElement; +use dom::htmlhrelement::HTMLHRElement; use dom::htmlimageelement::HTMLImageElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::element::{Element, Attr}; diff --git a/src/components/script/script.rc b/src/components/script/script.rc index e903622ee4d..0ba9ef8c81f 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -48,6 +48,7 @@ pub mod dom { pub mod HTMLDocumentBinding; pub mod HTMLElementBinding; pub mod HTMLHeadElementBinding; + pub mod HTMLHRElementBinding; pub mod HTMLHtmlElementBinding; pub mod HTMLImageElementBinding; pub mod HTMLParagraphElementBinding; @@ -77,6 +78,7 @@ pub mod dom { pub mod htmlcollection; pub mod htmldocument; pub mod htmlelement; + pub mod htmlhrelement; pub mod htmlimageelement; pub mod htmlscriptelement; pub mod mouseevent;