Previously, `string-cache` defined:
* An string-like `Atom` type,
* An `atom!("foo")` macro that expands to a value of that type, for a set of strings known at compile-time,
* A `struct Namespace(Atom);` type
* A `ns!(html)` macro that maps known prefixed to `Namespace` values with the corresponding namespace URL.
Adding a string to the static set required making a change to the `string-cache` crate.
With 0.3, the `Atom` type is now generic, with a type parameter that provides a set of static strings. We can have multiple such sets, defined in different crates. The `string_cache_codegen` crate, to be used in build scripts, generates code that defines such a set, a new atom type (a type alias for `Atom<_>` with the type parameter set), and an `atom!`-like macro.
The html5ever repository has a new `html5ever_atoms` crate that defines three such types: `Prefix`, `Namespace`, and `LocalName` (with respective `namespace_prefix!`, `namespace_url!`, and `local_name!` macros). It also defines the `ns!` macro like before.
This repository has a new `servo_atoms` crate in `components/atoms` that, for now, defines a single `Atom` type (and `atom!`) macro. (`servo_atoms::Atom` is defined as something like `type Atom = string_cache::Atom<ServoStaticStringSet>;`, so overall there’s now two types named `Atom`.)
In this PR, `servo_atoms::Atom` is used for everything else that was `string_cache::Atom` before. But more atom types can be defined as needed. Two reasons to do this are to auto-generate the set of static strings (I’m planning to do this for CSS property names, which is the motivation for this change), or to have the type system help us avoid mix up unrelated things (this is why we had a `Namespace` type ever before this change).
Introducing new types helped me find a bug: when creating a new attribute `dom::Element::set_style_attr`, would pass `Some(atom!("style"))` instead of `None` (now `Option<html5ever_atoms::Prefix>` instead of `Option<string_cache::Atom>`) to the `prefix` argument of `Attr::new`. I suppose the author of that code confused it with the `local_name` argument.
---
Note that Stylo is not affected by any of this. The `gecko_string_cache` module is unchanged, with a single `Atom` type. The `style` crate conditionally compiles `Prefix` and `LocalName` re-exports for that are both `gecko_string_cache::Atom` on stylo.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Source-Repo: https://github.com/servo/servo
Source-Revision: 5b4cc9568dbd5c15e5d2fbc62719172f11566ffa
450 lines
17 KiB
Rust
450 lines
17 KiB
Rust
/* 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 cssparser::RGBA;
|
|
use dom::attr::Attr;
|
|
use dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
|
|
use dom::bindings::codegen::Bindings::HTMLTableElementBinding;
|
|
use dom::bindings::codegen::Bindings::HTMLTableElementBinding::HTMLTableElementMethods;
|
|
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
|
|
use dom::bindings::error::{Error, ErrorResult, Fallible};
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::js::{JS, LayoutJS, MutNullableHeap, Root, RootedReference};
|
|
use dom::bindings::str::DOMString;
|
|
use dom::document::Document;
|
|
use dom::element::{AttributeMutation, Element, RawLayoutElementHelpers};
|
|
use dom::htmlcollection::{CollectionFilter, HTMLCollection};
|
|
use dom::htmlelement::HTMLElement;
|
|
use dom::htmltablecaptionelement::HTMLTableCaptionElement;
|
|
use dom::htmltablecolelement::HTMLTableColElement;
|
|
use dom::htmltablerowelement::HTMLTableRowElement;
|
|
use dom::htmltablesectionelement::HTMLTableSectionElement;
|
|
use dom::node::{Node, document_from_node, window_from_node};
|
|
use dom::virtualmethods::VirtualMethods;
|
|
use html5ever_atoms::LocalName;
|
|
use std::cell::Cell;
|
|
use style::attr::{AttrValue, LengthOrPercentageOrAuto, parse_unsigned_integer};
|
|
|
|
#[dom_struct]
|
|
pub struct HTMLTableElement {
|
|
htmlelement: HTMLElement,
|
|
border: Cell<Option<u32>>,
|
|
cellspacing: Cell<Option<u32>>,
|
|
tbodies: MutNullableHeap<JS<HTMLCollection>>,
|
|
}
|
|
|
|
#[allow(unrooted_must_root)]
|
|
#[derive(JSTraceable, HeapSizeOf)]
|
|
struct TableRowFilter {
|
|
sections: Vec<JS<Node>>,
|
|
}
|
|
|
|
impl CollectionFilter for TableRowFilter {
|
|
fn filter(&self, elem: &Element, root: &Node) -> bool {
|
|
elem.is::<HTMLTableRowElement>() &&
|
|
(root.is_parent_of(elem.upcast())
|
|
|| self.sections.iter().any(|ref section| section.is_parent_of(elem.upcast())))
|
|
}
|
|
}
|
|
|
|
impl HTMLTableElement {
|
|
fn new_inherited(local_name: LocalName, prefix: Option<DOMString>, document: &Document)
|
|
-> HTMLTableElement {
|
|
HTMLTableElement {
|
|
htmlelement: HTMLElement::new_inherited(local_name, prefix, document),
|
|
border: Cell::new(None),
|
|
cellspacing: Cell::new(None),
|
|
tbodies: Default::default(),
|
|
}
|
|
}
|
|
|
|
#[allow(unrooted_must_root)]
|
|
pub fn new(local_name: LocalName, prefix: Option<DOMString>, document: &Document)
|
|
-> Root<HTMLTableElement> {
|
|
Node::reflect_node(box HTMLTableElement::new_inherited(local_name, prefix, document),
|
|
document,
|
|
HTMLTableElementBinding::Wrap)
|
|
}
|
|
|
|
pub fn get_border(&self) -> Option<u32> {
|
|
self.border.get()
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-thead
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-tfoot
|
|
fn get_first_section_of_type(&self, atom: &LocalName) -> Option<Root<HTMLTableSectionElement>> {
|
|
self.upcast::<Node>()
|
|
.child_elements()
|
|
.find(|n| n.is::<HTMLTableSectionElement>() && n.local_name() == atom)
|
|
.and_then(|n| n.downcast().map(Root::from_ref))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-thead
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-tfoot
|
|
fn set_first_section_of_type<P>(&self,
|
|
atom: &LocalName,
|
|
section: Option<&HTMLTableSectionElement>,
|
|
reference_predicate: P)
|
|
-> ErrorResult
|
|
where P: FnMut(&Root<Element>) -> bool {
|
|
if let Some(e) = section {
|
|
if e.upcast::<Element>().local_name() != atom {
|
|
return Err(Error::HierarchyRequest)
|
|
}
|
|
}
|
|
|
|
self.delete_first_section_of_type(atom);
|
|
|
|
let node = self.upcast::<Node>();
|
|
|
|
if let Some(section) = section {
|
|
let reference_element = node.child_elements().find(reference_predicate);
|
|
let reference_node = reference_element.r().map(|e| e.upcast());
|
|
|
|
try!(node.InsertBefore(section.upcast(), reference_node));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-createthead
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-createtfoot
|
|
fn create_section_of_type(&self, atom: &LocalName) -> Root<HTMLTableSectionElement> {
|
|
if let Some(section) = self.get_first_section_of_type(atom) {
|
|
return section
|
|
}
|
|
|
|
let section = HTMLTableSectionElement::new(atom.clone(),
|
|
None,
|
|
&document_from_node(self));
|
|
match atom {
|
|
&local_name!("thead") => self.SetTHead(Some(§ion)),
|
|
&local_name!("tfoot") => self.SetTFoot(Some(§ion)),
|
|
_ => unreachable!("unexpected section type")
|
|
}.expect("unexpected section type");
|
|
|
|
section
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-deletethead
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-deletetfoot
|
|
fn delete_first_section_of_type(&self, atom: &LocalName) {
|
|
if let Some(thead) = self.get_first_section_of_type(atom) {
|
|
thead.upcast::<Node>().remove_self();
|
|
}
|
|
}
|
|
|
|
fn get_rows(&self) -> TableRowFilter {
|
|
TableRowFilter {
|
|
sections: self.upcast::<Node>()
|
|
.children()
|
|
.filter_map(|ref node|
|
|
node.downcast::<HTMLTableSectionElement>().map(|_| JS::from_ref(&**node)))
|
|
.collect()
|
|
}
|
|
}
|
|
}
|
|
|
|
impl HTMLTableElementMethods for HTMLTableElement {
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-rows
|
|
fn Rows(&self) -> Root<HTMLCollection> {
|
|
let filter = self.get_rows();
|
|
HTMLCollection::new(&window_from_node(self), self.upcast(), box filter)
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-caption
|
|
fn GetCaption(&self) -> Option<Root<HTMLTableCaptionElement>> {
|
|
self.upcast::<Node>().children().filter_map(Root::downcast).next()
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-caption
|
|
fn SetCaption(&self, new_caption: Option<&HTMLTableCaptionElement>) {
|
|
if let Some(ref caption) = self.GetCaption() {
|
|
caption.upcast::<Node>().remove_self();
|
|
}
|
|
|
|
if let Some(caption) = new_caption {
|
|
let node = self.upcast::<Node>();
|
|
node.InsertBefore(caption.upcast(), node.GetFirstChild().r())
|
|
.expect("Insertion failed");
|
|
}
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-createcaption
|
|
fn CreateCaption(&self) -> Root<HTMLTableCaptionElement> {
|
|
match self.GetCaption() {
|
|
Some(caption) => caption,
|
|
None => {
|
|
let caption = HTMLTableCaptionElement::new(local_name!("caption"),
|
|
None,
|
|
&document_from_node(self));
|
|
self.SetCaption(Some(&caption));
|
|
caption
|
|
}
|
|
}
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-deletecaption
|
|
fn DeleteCaption(&self) {
|
|
if let Some(caption) = self.GetCaption() {
|
|
caption.upcast::<Node>().remove_self();
|
|
}
|
|
}
|
|
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-thead
|
|
fn GetTHead(&self) -> Option<Root<HTMLTableSectionElement>> {
|
|
self.get_first_section_of_type(&local_name!("thead"))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-thead
|
|
fn SetTHead(&self, thead: Option<&HTMLTableSectionElement>) -> ErrorResult {
|
|
self.set_first_section_of_type(&local_name!("thead"), thead, |n| {
|
|
!n.is::<HTMLTableCaptionElement>() && !n.is::<HTMLTableColElement>()
|
|
})
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-createthead
|
|
fn CreateTHead(&self) -> Root<HTMLTableSectionElement> {
|
|
self.create_section_of_type(&local_name!("thead"))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-deletethead
|
|
fn DeleteTHead(&self) {
|
|
self.delete_first_section_of_type(&local_name!("thead"))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-tfoot
|
|
fn GetTFoot(&self) -> Option<Root<HTMLTableSectionElement>> {
|
|
self.get_first_section_of_type(&local_name!("tfoot"))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-tfoot
|
|
fn SetTFoot(&self, tfoot: Option<&HTMLTableSectionElement>) -> ErrorResult {
|
|
self.set_first_section_of_type(&local_name!("tfoot"), tfoot, |n| {
|
|
if n.is::<HTMLTableCaptionElement>() || n.is::<HTMLTableColElement>() {
|
|
return false;
|
|
}
|
|
|
|
if n.is::<HTMLTableSectionElement>() {
|
|
let name = n.local_name();
|
|
if name == &local_name!("thead") || name == &local_name!("tbody") {
|
|
return false;
|
|
}
|
|
|
|
}
|
|
|
|
true
|
|
})
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-createtfoot
|
|
fn CreateTFoot(&self) -> Root<HTMLTableSectionElement> {
|
|
self.create_section_of_type(&local_name!("tfoot"))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-deletetfoot
|
|
fn DeleteTFoot(&self) {
|
|
self.delete_first_section_of_type(&local_name!("tfoot"))
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-tbodies
|
|
fn TBodies(&self) -> Root<HTMLCollection> {
|
|
#[derive(JSTraceable)]
|
|
struct TBodiesFilter;
|
|
impl CollectionFilter for TBodiesFilter {
|
|
fn filter(&self, elem: &Element, root: &Node) -> bool {
|
|
elem.is::<HTMLTableSectionElement>() &&
|
|
elem.local_name() == &local_name!("tbody") &&
|
|
elem.upcast::<Node>().GetParentNode().r() == Some(root)
|
|
}
|
|
}
|
|
|
|
self.tbodies.or_init(|| {
|
|
let window = window_from_node(self);
|
|
let filter = box TBodiesFilter;
|
|
HTMLCollection::create(&window, self.upcast(), filter)
|
|
})
|
|
}
|
|
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-createtbody
|
|
fn CreateTBody(&self) -> Root<HTMLTableSectionElement> {
|
|
let tbody = HTMLTableSectionElement::new(local_name!("tbody"),
|
|
None,
|
|
&document_from_node(self));
|
|
let node = self.upcast::<Node>();
|
|
let last_tbody =
|
|
node.rev_children()
|
|
.filter_map(Root::downcast::<Element>)
|
|
.find(|n| n.is::<HTMLTableSectionElement>() && n.local_name() == &local_name!("tbody"));
|
|
let reference_element =
|
|
last_tbody.and_then(|t| t.upcast::<Node>().GetNextSibling());
|
|
|
|
node.InsertBefore(tbody.upcast(), reference_element.r())
|
|
.expect("Insertion failed");
|
|
tbody
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-insertrow
|
|
fn InsertRow(&self, index: i32) -> Fallible<Root<HTMLTableRowElement>> {
|
|
let rows = self.Rows();
|
|
let number_of_row_elements = rows.Length();
|
|
|
|
if index < -1 || index > number_of_row_elements as i32 {
|
|
return Err(Error::IndexSize);
|
|
}
|
|
|
|
let new_row = HTMLTableRowElement::new(local_name!("tr"),
|
|
None,
|
|
&document_from_node(self));
|
|
let node = self.upcast::<Node>();
|
|
|
|
if number_of_row_elements == 0 {
|
|
// append new row to last or new tbody in table
|
|
if let Some(last_tbody) = node.rev_children()
|
|
.filter_map(Root::downcast::<Element>)
|
|
.find(|n| n.is::<HTMLTableSectionElement>() && n.local_name() == &local_name!("tbody")) {
|
|
last_tbody.upcast::<Node>().AppendChild(new_row.upcast::<Node>())
|
|
.expect("InsertRow failed to append first row.");
|
|
} else {
|
|
let tbody = self.CreateTBody();
|
|
node.AppendChild(tbody.upcast())
|
|
.expect("InsertRow failed to append new tbody.");
|
|
|
|
tbody.upcast::<Node>().AppendChild(new_row.upcast::<Node>())
|
|
.expect("InsertRow failed to append first row.");
|
|
}
|
|
} else if index == number_of_row_elements as i32 || index == -1 {
|
|
// append new row to parent of last row in table
|
|
let last_row = rows.Item(number_of_row_elements - 1)
|
|
.expect("InsertRow failed to find last row in table.");
|
|
|
|
let last_row_parent =
|
|
last_row.upcast::<Node>().GetParentNode()
|
|
.expect("InsertRow failed to find parent of last row in table.");
|
|
|
|
last_row_parent.upcast::<Node>().AppendChild(new_row.upcast::<Node>())
|
|
.expect("InsertRow failed to append last row.");
|
|
} else {
|
|
// insert new row before the index-th row in rows using the same parent
|
|
let ith_row = rows.Item(index as u32)
|
|
.expect("InsertRow failed to find a row in table.");
|
|
|
|
let ith_row_parent = ith_row.upcast::<Node>().GetParentNode()
|
|
.expect("InsertRow failed to find parent of a row in table.");
|
|
|
|
ith_row_parent.upcast::<Node>().InsertBefore(new_row.upcast::<Node>(), Some(ith_row.upcast::<Node>()))
|
|
.expect("InsertRow failed to append row");
|
|
}
|
|
|
|
Ok(new_row)
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-deleterow
|
|
fn DeleteRow(&self, mut index: i32) -> Fallible<()> {
|
|
let rows = self.Rows();
|
|
// Step 1.
|
|
if index == -1 {
|
|
index = rows.Length() as i32 - 1;
|
|
}
|
|
// Step 2.
|
|
if index < 0 || index as u32 >= rows.Length() {
|
|
return Err(Error::IndexSize);
|
|
}
|
|
// Step 3.
|
|
Root::upcast::<Node>(rows.Item(index as u32).unwrap()).remove_self();
|
|
Ok(())
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-bgcolor
|
|
make_getter!(BgColor, "bgcolor");
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-bgcolor
|
|
make_legacy_color_setter!(SetBgColor, "bgcolor");
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-width
|
|
make_getter!(Width, "width");
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-table-width
|
|
make_nonzero_dimension_setter!(SetWidth, "width");
|
|
}
|
|
|
|
pub trait HTMLTableElementLayoutHelpers {
|
|
fn get_background_color(&self) -> Option<RGBA>;
|
|
fn get_border(&self) -> Option<u32>;
|
|
fn get_cellspacing(&self) -> Option<u32>;
|
|
fn get_width(&self) -> LengthOrPercentageOrAuto;
|
|
}
|
|
|
|
impl HTMLTableElementLayoutHelpers for LayoutJS<HTMLTableElement> {
|
|
#[allow(unsafe_code)]
|
|
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()
|
|
}
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
fn get_border(&self) -> Option<u32> {
|
|
unsafe {
|
|
(*self.unsafe_get()).border.get()
|
|
}
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
fn get_cellspacing(&self) -> Option<u32> {
|
|
unsafe {
|
|
(*self.unsafe_get()).cellspacing.get()
|
|
}
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
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)
|
|
}
|
|
}
|
|
}
|
|
|
|
impl VirtualMethods for HTMLTableElement {
|
|
fn super_type(&self) -> Option<&VirtualMethods> {
|
|
Some(self.upcast::<HTMLElement>() as &VirtualMethods)
|
|
}
|
|
|
|
fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
|
|
self.super_type().unwrap().attribute_mutated(attr, mutation);
|
|
match *attr.local_name() {
|
|
local_name!("border") => {
|
|
// According to HTML5 § 14.3.9, invalid values map to 1px.
|
|
self.border.set(mutation.new_value(attr).map(|value| {
|
|
parse_unsigned_integer(value.chars()).unwrap_or(1)
|
|
}));
|
|
}
|
|
local_name!("cellspacing") => {
|
|
self.cellspacing.set(mutation.new_value(attr).and_then(|value| {
|
|
parse_unsigned_integer(value.chars()).ok()
|
|
}));
|
|
},
|
|
_ => {},
|
|
}
|
|
}
|
|
|
|
fn parse_plain_attribute(&self, local_name: &LocalName, value: DOMString) -> AttrValue {
|
|
match *local_name {
|
|
local_name!("border") => AttrValue::from_u32(value.into(), 1),
|
|
local_name!("width") => AttrValue::from_nonzero_dimension(value.into()),
|
|
local_name!("bgcolor") => AttrValue::from_legacy_color(value.into()),
|
|
_ => self.super_type().unwrap().parse_plain_attribute(local_name, value),
|
|
}
|
|
}
|
|
}
|