diff options
Diffstat (limited to 'components/script/dom/htmltablecellelement.rs')
| -rw-r--r-- | components/script/dom/htmltablecellelement.rs | 159 |
1 files changed, 98 insertions, 61 deletions
diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs index ef4bffba5d7..75a2140a090 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/components/script/dom/htmltablecellelement.rs @@ -1,22 +1,24 @@ /* 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::HTMLTableCellElementBinding::HTMLTableCellElementMethods; +use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::root::LayoutDom; +use crate::dom::bindings::str::DOMString; +use crate::dom::document::Document; +use crate::dom::element::{Element, LayoutElementHelpers}; +use crate::dom::htmlelement::HTMLElement; +use crate::dom::htmltablerowelement::HTMLTableRowElement; +use crate::dom::node::Node; +use crate::dom::virtualmethods::VirtualMethods; use cssparser::RGBA; -use dom::bindings::codegen::Bindings::HTMLTableCellElementBinding::HTMLTableCellElementMethods; -use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; -use dom::bindings::inheritance::Castable; -use dom::bindings::js::LayoutJS; -use dom::bindings::str::DOMString; -use dom::document::Document; -use dom::element::{Element, RawLayoutElementHelpers}; -use dom::htmlelement::HTMLElement; -use dom::htmltablerowelement::HTMLTableRowElement; -use dom::node::Node; -use dom::virtualmethods::VirtualMethods; use dom_struct::dom_struct; -use html5ever_atoms::LocalName; +use html5ever::{LocalName, Prefix}; use style::attr::{AttrValue, LengthOrPercentageOrAuto}; +use style::context::QuirksMode; const DEFAULT_COLSPAN: u32 = 1; const DEFAULT_ROWSPAN: u32 = 1; @@ -27,14 +29,32 @@ pub struct HTMLTableCellElement { } impl HTMLTableCellElement { - pub fn new_inherited(tag_name: LocalName, - prefix: Option<DOMString>, - document: &Document) - -> HTMLTableCellElement { + fn new_inherited( + local_name: LocalName, + prefix: Option<Prefix>, + document: &Document, + ) -> HTMLTableCellElement { HTMLTableCellElement { - htmlelement: HTMLElement::new_inherited(tag_name, prefix, document), + htmlelement: HTMLElement::new_inherited(local_name, prefix, document), } } + + #[allow(unrooted_must_root)] + pub fn new( + local_name: LocalName, + prefix: Option<Prefix>, + document: &Document, + ) -> DomRoot<HTMLTableCellElement> { + let n = Node::reflect_node( + Box::new(HTMLTableCellElement::new_inherited( + local_name, prefix, document, + )), + document, + ); + + n.upcast::<Node>().set_weird_parser_insertion_mode(); + n + } } impl HTMLTableCellElementMethods for HTMLTableCellElement { @@ -73,70 +93,87 @@ impl HTMLTableCellElementMethods for HTMLTableCellElement { _ => return -1, }; - parent_children.filter(|c| c.is::<HTMLTableCellElement>()) - .position(|c| &*c == self_node) - .map_or(-1, |p| p as i32) + parent_children + .filter(|c| c.is::<HTMLTableCellElement>()) + .position(|c| &*c == self_node) + .map_or(-1, |p| p as i32) } } - pub trait HTMLTableCellElementLayoutHelpers { - fn get_background_color(&self) -> Option<RGBA>; - fn get_colspan(&self) -> Option<u32>; - fn get_rowspan(&self) -> Option<u32>; - fn get_width(&self) -> LengthOrPercentageOrAuto; + fn get_background_color(self) -> Option<RGBA>; + fn get_colspan(self) -> Option<u32>; + fn get_rowspan(self) -> Option<u32>; + fn get_width(self) -> LengthOrPercentageOrAuto; } -#[allow(unsafe_code)] -impl HTMLTableCellElementLayoutHelpers for LayoutJS<HTMLTableCellElement> { - 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 HTMLTableCellElementLayoutHelpers for LayoutDom<'_, HTMLTableCellElement> { + fn get_background_color(self) -> Option<RGBA> { + self.upcast::<Element>() + .get_attr_for_layout(&ns!(), &local_name!("bgcolor")) + .and_then(AttrValue::as_color) + .cloned() } - fn get_colspan(&self) -> Option<u32> { - unsafe { - (&*self.upcast::<Element>().unsafe_get()) - .get_attr_for_layout(&ns!(), &local_name!("colspan")) - .map(AttrValue::as_uint) - } + fn get_colspan(self) -> Option<u32> { + self.upcast::<Element>() + .get_attr_for_layout(&ns!(), &local_name!("colspan")) + .map(AttrValue::as_uint) } - fn get_rowspan(&self) -> Option<u32> { - unsafe { - (&*self.upcast::<Element>().unsafe_get()) - .get_attr_for_layout(&ns!(), &local_name!("rowspan")) - .map(AttrValue::as_uint) - } + fn get_rowspan(self) -> Option<u32> { + self.upcast::<Element>() + .get_attr_for_layout(&ns!(), &local_name!("rowspan")) + .map(AttrValue::as_uint) } - fn get_width(&self) -> LengthOrPercentageOrAuto { - unsafe { - (&*self.upcast::<Element>().unsafe_get()) - .get_attr_for_layout(&ns!(), &local_name!("width")) - .map(AttrValue::as_dimension) - .cloned() - .unwrap_or(LengthOrPercentageOrAuto::Auto) - } + fn get_width(self) -> LengthOrPercentageOrAuto { + self.upcast::<Element>() + .get_attr_for_layout(&ns!(), &local_name!("width")) + .map(AttrValue::as_dimension) + .cloned() + .unwrap_or(LengthOrPercentageOrAuto::Auto) } } impl VirtualMethods for HTMLTableCellElement { - 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!("colspan") => AttrValue::from_u32(value.into(), DEFAULT_COLSPAN), - local_name!("rowspan") => AttrValue::from_u32(value.into(), DEFAULT_ROWSPAN), + local_name!("colspan") => { + let mut attr = AttrValue::from_u32(value.into(), DEFAULT_COLSPAN); + if let AttrValue::UInt(ref mut s, ref mut val) = attr { + if *val == 0 { + *val = 1; + *s = "1".into(); + } + } + attr + }, + local_name!("rowspan") => { + let mut attr = AttrValue::from_u32(value.into(), DEFAULT_ROWSPAN); + if let AttrValue::UInt(ref mut s, ref mut val) = attr { + if *val == 0 { + let node = self.upcast::<Node>(); + let doc = node.owner_doc(); + // rowspan = 0 is not supported in quirks mode + if doc.quirks_mode() != QuirksMode::NoQuirks { + *val = 1; + *s = "1".into(); + } + } + } + attr + }, local_name!("bgcolor") => AttrValue::from_legacy_color(value.into()), local_name!("width") => AttrValue::from_nonzero_dimension(value.into()), - _ => self.super_type().unwrap().parse_plain_attribute(local_name, value), + _ => self + .super_type() + .unwrap() + .parse_plain_attribute(local_name, value), } } } |