aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmltablerowelement.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/htmltablerowelement.rs')
-rw-r--r--components/script/dom/htmltablerowelement.rs127
1 files changed, 69 insertions, 58 deletions
diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs
index be1b636beb4..5da05be4019 100644
--- a/components/script/dom/htmltablerowelement.rs
+++ b/components/script/dom/htmltablerowelement.rs
@@ -1,48 +1,50 @@
/* 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/. */
-
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods;
+use crate::dom::bindings::codegen::Bindings::HTMLTableRowElementBinding::HTMLTableRowElementMethods;
+use crate::dom::bindings::codegen::Bindings::HTMLTableSectionElementBinding::HTMLTableSectionElementMethods;
+use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
+use crate::dom::bindings::error::{ErrorResult, Fallible};
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::root::{DomRoot, LayoutDom, MutNullableDom};
+use crate::dom::bindings::str::DOMString;
+use crate::dom::document::Document;
+use crate::dom::element::{Element, LayoutElementHelpers};
+use crate::dom::htmlcollection::{CollectionFilter, HTMLCollection};
+use crate::dom::htmlelement::HTMLElement;
+use crate::dom::htmltablecellelement::HTMLTableCellElement;
+use crate::dom::htmltableelement::HTMLTableElement;
+use crate::dom::htmltablesectionelement::HTMLTableSectionElement;
+use crate::dom::node::{window_from_node, Node};
+use crate::dom::virtualmethods::VirtualMethods;
use cssparser::RGBA;
-use dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods;
-use dom::bindings::codegen::Bindings::HTMLTableRowElementBinding::{self, HTMLTableRowElementMethods};
-use dom::bindings::codegen::Bindings::HTMLTableSectionElementBinding::HTMLTableSectionElementMethods;
-use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
-use dom::bindings::error::{ErrorResult, Fallible};
-use dom::bindings::inheritance::Castable;
-use dom::bindings::js::{LayoutJS, MutNullableJS, Root, RootedReference};
-use dom::bindings::str::DOMString;
-use dom::document::Document;
-use dom::element::{Element, RawLayoutElementHelpers};
-use dom::htmlcollection::{CollectionFilter, HTMLCollection};
-use dom::htmlelement::HTMLElement;
-use dom::htmltabledatacellelement::HTMLTableDataCellElement;
-use dom::htmltableelement::HTMLTableElement;
-use dom::htmltableheadercellelement::HTMLTableHeaderCellElement;
-use dom::htmltablesectionelement::HTMLTableSectionElement;
-use dom::node::{Node, window_from_node};
-use dom::virtualmethods::VirtualMethods;
use dom_struct::dom_struct;
-use html5ever_atoms::LocalName;
+use html5ever::{LocalName, Prefix};
use style::attr::AttrValue;
#[derive(JSTraceable)]
struct CellsFilter;
impl CollectionFilter for CellsFilter {
fn filter(&self, elem: &Element, root: &Node) -> bool {
- (elem.is::<HTMLTableHeaderCellElement>() || elem.is::<HTMLTableDataCellElement>()) &&
- elem.upcast::<Node>().GetParentNode().r() == Some(root)
+ (elem.is::<HTMLTableCellElement>()) &&
+ elem.upcast::<Node>().GetParentNode().as_deref() == Some(root)
}
}
#[dom_struct]
pub struct HTMLTableRowElement {
htmlelement: HTMLElement,
- cells: MutNullableJS<HTMLCollection>,
+ cells: MutNullableDom<HTMLCollection>,
}
impl HTMLTableRowElement {
- fn new_inherited(local_name: LocalName, prefix: Option<DOMString>, document: &Document)
- -> HTMLTableRowElement {
+ fn new_inherited(
+ local_name: LocalName,
+ prefix: Option<Prefix>,
+ document: &Document,
+ ) -> HTMLTableRowElement {
HTMLTableRowElement {
htmlelement: HTMLElement::new_inherited(local_name, prefix, document),
cells: Default::default(),
@@ -50,19 +52,29 @@ impl HTMLTableRowElement {
}
#[allow(unrooted_must_root)]
- pub fn new(local_name: LocalName, prefix: Option<DOMString>, document: &Document)
- -> Root<HTMLTableRowElement> {
- Node::reflect_node(box HTMLTableRowElement::new_inherited(local_name, prefix, document),
- document,
- HTMLTableRowElementBinding::Wrap)
+ pub fn new(
+ local_name: LocalName,
+ prefix: Option<Prefix>,
+ document: &Document,
+ ) -> DomRoot<HTMLTableRowElement> {
+ let n = Node::reflect_node(
+ Box::new(HTMLTableRowElement::new_inherited(
+ local_name, prefix, document,
+ )),
+ document,
+ );
+
+ n.upcast::<Node>().set_weird_parser_insertion_mode();
+ n
}
/// Determine the index for this `HTMLTableRowElement` within the given
/// `HTMLCollection`. Returns `-1` if not found within collection.
- fn row_index(&self, collection: Root<HTMLCollection>) -> i32 {
- collection.elements_iter()
- .position(|elem| (&elem as &Element) == self.upcast())
- .map_or(-1, |i| i as i32)
+ fn row_index(&self, collection: DomRoot<HTMLCollection>) -> i32 {
+ collection
+ .elements_iter()
+ .position(|elem| (&elem as &Element) == self.upcast())
+ .map_or(-1, |i| i as i32)
}
}
@@ -74,30 +86,28 @@ impl HTMLTableRowElementMethods for HTMLTableRowElement {
make_legacy_color_setter!(SetBgColor, "bgcolor");
// https://html.spec.whatwg.org/multipage/#dom-tr-cells
- fn Cells(&self) -> Root<HTMLCollection> {
+ fn Cells(&self) -> DomRoot<HTMLCollection> {
self.cells.or_init(|| {
let window = window_from_node(self);
- let filter = box CellsFilter;
+ let filter = Box::new(CellsFilter);
HTMLCollection::create(&window, self.upcast(), filter)
})
}
// https://html.spec.whatwg.org/multipage/#dom-tr-insertcell
- fn InsertCell(&self, index: i32) -> Fallible<Root<HTMLElement>> {
+ fn InsertCell(&self, index: i32) -> Fallible<DomRoot<HTMLElement>> {
let node = self.upcast::<Node>();
node.insert_cell_or_row(
index,
|| self.Cells(),
- || HTMLTableDataCellElement::new(local_name!("td"), None, &node.owner_doc()))
+ || HTMLTableCellElement::new(local_name!("td"), None, &node.owner_doc()),
+ )
}
// https://html.spec.whatwg.org/multipage/#dom-tr-deletecell
fn DeleteCell(&self, index: i32) -> ErrorResult {
let node = self.upcast::<Node>();
- node.delete_cell_or_row(
- index,
- || self.Cells(),
- |n| n.is::<HTMLTableDataCellElement>())
+ node.delete_cell_or_row(index, || self.Cells(), |n| n.is::<HTMLTableCellElement>())
}
// https://html.spec.whatwg.org/multipage/#dom-tr-rowindex
@@ -116,8 +126,9 @@ impl HTMLTableRowElementMethods for HTMLTableRowElement {
Some(parent) => parent,
None => return -1,
};
- grandparent.downcast::<HTMLTableElement>()
- .map_or(-1, |table| self.row_index(table.Rows()))
+ grandparent
+ .downcast::<HTMLTableElement>()
+ .map_or(-1, |table| self.row_index(table.Rows()))
}
// https://html.spec.whatwg.org/multipage/#dom-tr-sectionrowindex
@@ -138,30 +149,30 @@ impl HTMLTableRowElementMethods for HTMLTableRowElement {
}
pub trait HTMLTableRowElementLayoutHelpers {
- fn get_background_color(&self) -> Option<RGBA>;
+ fn get_background_color(self) -> Option<RGBA>;
}
-#[allow(unsafe_code)]
-impl HTMLTableRowElementLayoutHelpers for LayoutJS<HTMLTableRowElement> {
- fn get_background_color(&self) -> Option<RGBA> {
- unsafe {
- (&*self.upcast::<Element>().unsafe_get())
- .get_attr_for_layout(&ns!(), &local_name!("bgcolor"))
- .and_then(AttrValue::as_color)
- .cloned()
- }
+impl HTMLTableRowElementLayoutHelpers for LayoutDom<'_, HTMLTableRowElement> {
+ fn get_background_color(self) -> Option<RGBA> {
+ self.upcast::<Element>()
+ .get_attr_for_layout(&ns!(), &local_name!("bgcolor"))
+ .and_then(AttrValue::as_color)
+ .cloned()
}
}
impl VirtualMethods for HTMLTableRowElement {
- fn super_type(&self) -> Option<&VirtualMethods> {
- Some(self.upcast::<HTMLElement>() as &VirtualMethods)
+ fn super_type(&self) -> Option<&dyn VirtualMethods> {
+ Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
}
fn parse_plain_attribute(&self, local_name: &LocalName, value: DOMString) -> AttrValue {
match *local_name {
local_name!("bgcolor") => AttrValue::from_legacy_color(value.into()),
- _ => self.super_type().unwrap().parse_plain_attribute(local_name, value),
+ _ => self
+ .super_type()
+ .unwrap()
+ .parse_plain_attribute(local_name, value),
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 18:58:37 +0000