diff options
Diffstat (limited to 'src/components/script')
-rw-r--r-- | src/components/script/dom/bindings/codegen/Bindings.conf | 1 | ||||
-rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 1 | ||||
-rw-r--r-- | src/components/script/dom/bindings/codegen/HTMLHRElement.webidl | 30 | ||||
-rw-r--r-- | src/components/script/dom/bindings/node.rs | 3 | ||||
-rw-r--r-- | src/components/script/dom/bindings/utils.rs | 2 | ||||
-rw-r--r-- | src/components/script/dom/element.rs | 5 | ||||
-rw-r--r-- | src/components/script/dom/htmlhrelement.rs | 47 | ||||
-rw-r--r-- | src/components/script/html/hubbub_html_parser.rs | 3 | ||||
-rw-r--r-- | src/components/script/script.rc | 2 |
9 files changed, 91 insertions, 3 deletions
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<ScriptView>) -> *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; |