diff options
-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/HTMLTableSectionElement.webidl | 33 | ||||
-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/htmltablesectionelement.rs | 43 | ||||
-rw-r--r-- | src/components/script/html/hubbub_html_parser.rs | 3 | ||||
-rw-r--r-- | src/components/script/script.rc | 2 | ||||
-rw-r--r-- | src/test/html/test_bindings.html | 4 |
10 files changed, 93 insertions, 4 deletions
diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf index 2feea771e5d..468137f66fe 100644 --- a/src/components/script/dom/bindings/codegen/Bindings.conf +++ b/src/components/script/dom/bindings/codegen/Bindings.conf @@ -561,6 +561,7 @@ addHTMLElement('HTMLScriptElement') addHTMLElement('HTMLSpanElement') addHTMLElement('HTMLStyleElement') addHTMLElement('HTMLTableElement') +addHTMLElement('HTMLTableSectionElement') # If you add one of these, you need to make sure nsDOMQS.h has the relevant # macros added for it diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index c9df70b276b..5e88ac04e37 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -4629,6 +4629,7 @@ class CGBindingRoot(CGThing): 'dom::htmlscriptelement::HTMLScriptElement', 'dom::htmlstyleelement::HTMLStyleElement', 'dom::htmltableelement::HTMLTableElement', + 'dom::htmltablesectionelement::HTMLTableSectionElement', 'dom::bindings::utils::*', 'dom::bindings::conversions::*', 'dom::blob::*', #XXXjdm diff --git a/src/components/script/dom/bindings/codegen/HTMLTableSectionElement.webidl b/src/components/script/dom/bindings/codegen/HTMLTableSectionElement.webidl new file mode 100644 index 00000000000..59134222960 --- /dev/null +++ b/src/components/script/dom/bindings/codegen/HTMLTableSectionElement.webidl @@ -0,0 +1,33 @@ +/* -*- 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/ + * + * © 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. + */ + +interface HTMLTableSectionElement : HTMLElement { + /* + readonly attribute HTMLCollection rows; + [Throws] + HTMLElement insertRow(optional long index = -1); + */ + [Throws] + void deleteRow(long index); +}; + +partial interface HTMLTableSectionElement { + [SetterThrows] + attribute DOMString align; + [SetterThrows] + attribute DOMString ch; + [SetterThrows] + attribute DOMString chOff; + [SetterThrows] + attribute DOMString vAlign; +}; diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index f248bd8d9ce..cf37d312d3c 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -12,6 +12,7 @@ use dom::element::{HTMLDivElementTypeId, HTMLImageElementTypeId, HTMLSpanElement use dom::element::{HTMLBodyElementTypeId, HTMLHRElementTypeId, HTMLIframeElementTypeId}; use dom::element::{HTMLParagraphElementTypeId, HTMLScriptElementTypeId, HTMLMetaElementTypeId}; use dom::element::{HTMLOListElementTypeId, HTMLStyleElementTypeId, HTMLTableElementTypeId}; +use dom::element::{HTMLTableSectionElementTypeId}; use dom::element::{HTMLHeadElement, HTMLHtmlElement, HTMLDivElement, HTMLSpanElement}; use dom::element::{HTMLParagraphElement}; use dom::htmlelement::HTMLElement; @@ -25,6 +26,7 @@ use dom::htmlolistelement::HTMLOListElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::htmlstyleelement::HTMLStyleElement; use dom::htmltableelement::HTMLTableElement; +use dom::htmltablesectionelement::HTMLTableSectionElement; use dom::node::{AbstractNode, Node, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId}; use dom::node::{DoctypeNodeTypeId, ScriptView, Text}; @@ -106,6 +108,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject ElementNodeTypeId(HTMLSpanElementTypeId) => generate_element!(HTMLSpanElement), ElementNodeTypeId(HTMLStyleElementTypeId) => generate_element!(HTMLStyleElement), ElementNodeTypeId(HTMLTableElementTypeId) => generate_element!(HTMLTableElement), + ElementNodeTypeId(HTMLTableSectionElementTypeId) => generate_element!(HTMLTableSectionElement), ElementNodeTypeId(_) => element::create(cx, node).ptr, CommentNodeTypeId | DoctypeNodeTypeId => text::create(cx, node).ptr, diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 5943a03f738..011e9695592 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, ..45]); + let protoArray = @mut ([0 as *JSObject, ..46]); 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 ac2fcb4055d..9cb095c12a8 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -12,6 +12,7 @@ use dom::bindings::codegen::{HTMLDivElementBinding, HTMLSpanElementBinding}; use dom::bindings::codegen::{HTMLImageElementBinding, HTMLOListElementBinding}; use dom::bindings::codegen::{HTMLMetaElementBinding, HTMLStyleElementBinding}; use dom::bindings::codegen::{HTMLTableElementBinding}; +use dom::bindings::codegen::{HTMLTableSectionElementBinding}; use dom::bindings::utils::{null_string, str}; use dom::bindings::utils::{BindingObject, CacheableWrapper, DOMString, ErrorResult, WrapperCache}; use dom::clientrect::ClientRect; @@ -28,6 +29,7 @@ use dom::htmlolistelement::HTMLOListElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::htmlstyleelement::HTMLStyleElement; use dom::htmltableelement::HTMLTableElement; +use dom::htmltablesectionelement::HTMLTableSectionElement; use dom::node::{ElementNodeTypeId, Node, ScriptView, AbstractNode}; use layout_interface::{ContentBoxQuery, ContentBoxResponse, ContentBoxesQuery}; use layout_interface::{ContentBoxesResponse}; @@ -116,7 +118,6 @@ pub struct HTMLParagraphElement { parent: HTMLElement } pub struct HTMLSelectElement { parent: HTMLElement } pub struct HTMLSmallElement { parent: HTMLElement } pub struct HTMLSpanElement { parent: HTMLElement } -pub struct HTMLTableSectionElement { parent: HTMLElement } pub struct HTMLTableCellElement { parent: HTMLElement } pub struct HTMLTableRowElement { parent: HTMLElement } pub struct HTMLTitleElement { parent: HTMLElement } @@ -205,6 +206,8 @@ generate_cacheable_wrapper!(HTMLStyleElement, HTMLStyleElementBinding::Wrap) generate_binding_object!(HTMLStyleElement) generate_cacheable_wrapper!(HTMLTableElement, HTMLTableElementBinding::Wrap) generate_binding_object!(HTMLTableElement) +generate_cacheable_wrapper!(HTMLTableSectionElement, HTMLTableSectionElementBinding::Wrap) +generate_binding_object!(HTMLTableSectionElement) // // Fancier elements diff --git a/src/components/script/dom/htmltablesectionelement.rs b/src/components/script/dom/htmltablesectionelement.rs new file mode 100644 index 00000000000..bf0bda484d6 --- /dev/null +++ b/src/components/script/dom/htmltablesectionelement.rs @@ -0,0 +1,43 @@ +/* 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 HTMLTableSectionElement { + parent: HTMLElement, +} + +impl HTMLTableSectionElement { + pub fn DeleteRow(&mut self, _index: i32, _rv: &mut ErrorResult) { + } + + pub fn Align(&self) -> DOMString { + null_string + } + + pub fn SetAlign(&mut self, _align: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn Ch(&self) -> DOMString { + null_string + } + + pub fn SetCh(&mut self, _ch: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn ChOff(&self) -> DOMString { + null_string + } + + pub fn SetChOff(&mut self, _ch_off: &DOMString, _rv: &mut ErrorResult) { + } + + pub fn VAlign(&self) -> DOMString { + null_string + } + + pub fn SetVAlign(&mut self, _v_align: &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 45334780290..245b7fd37aa 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -22,7 +22,7 @@ use dom::element::{HTMLBRElement, HTMLInputElement, HTMLLinkElement, HTMLOptionElement, HTMLParagraphElement, HTMLListItemElement, HTMLSelectElement, HTMLSmallElement, - HTMLSpanElement, HTMLTableSectionElement, + HTMLSpanElement, HTMLTableCellElement, HTMLTableRowElement, HTMLTitleElement, HTMLUListElement}; use dom::element::{HTMLHeadingElementTypeId, Heading1, Heading2, Heading3, Heading4, Heading5, @@ -37,6 +37,7 @@ use dom::htmlolistelement::HTMLOListElement; use dom::htmlscriptelement::HTMLScriptElement; use dom::htmlstyleelement::HTMLStyleElement; use dom::htmltableelement::HTMLTableElement; +use dom::htmltablesectionelement::HTMLTableSectionElement; 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 e4ae1daee06..c3e5698eac7 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -60,6 +60,7 @@ pub mod dom { pub mod HTMLSpanElementBinding; pub mod HTMLStyleElementBinding; pub mod HTMLTableElementBinding; + pub mod HTMLTableSectionElementBinding; pub mod MouseEventBinding; pub mod NodeBinding; pub mod PrototypeList; @@ -93,6 +94,7 @@ pub mod dom { pub mod htmlscriptelement; pub mod htmlstyleelement; pub mod htmltableelement; + pub mod htmltablesectionelement; pub mod mouseevent; pub mod node; pub mod uievent; diff --git a/src/test/html/test_bindings.html b/src/test/html/test_bindings.html index 75bb9906c29..95e5075695e 100644 --- a/src/test/html/test_bindings.html +++ b/src/test/html/test_bindings.html @@ -20,7 +20,9 @@ <applet></applet> <iframe></iframe> <ol type="1"></ol> - <table></table> + <table> + <tbody></tbody> + </table> <section>section</section> <aside>aside</aside> <b>b</b> |