> Here it is. > > ~~There's two major things that are unfinished here:~~ > - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done. > - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done. > > I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location. > > Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later. > > Generational GC works. SM doesn't work without it. > > The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`. > > Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it. > > `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`. > > `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case. > > This has been tested with the following zeal settings: > > GC after every allocation > JS_GC_ZEAL=2,1 > > GC after every 100 allocations (important for catching use-after-free bugs) > JS_GC_ZEAL=2,100 > > Verify pre barriers > JS_GC_ZEAL=4,1 > > Verify post barriers > JS_GC_ZEAL=11,1 Source-Repo: https://github.com/servo/servo Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
153 lines
4.8 KiB
Rust
153 lines
4.8 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 dom::attr::{Attr, AttrHelpers, AttrValue};
|
|
use dom::bindings::codegen::Bindings::HTMLTableCellElementBinding::HTMLTableCellElementMethods;
|
|
use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTableCellElementDerived};
|
|
use dom::document::Document;
|
|
use dom::eventtarget::{EventTarget, EventTargetTypeId};
|
|
use dom::element::ElementTypeId;
|
|
use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
|
|
use dom::node::NodeTypeId;
|
|
use dom::virtualmethods::VirtualMethods;
|
|
|
|
use util::str::{self, DOMString, LengthOrPercentageOrAuto};
|
|
|
|
use cssparser::RGBA;
|
|
use string_cache::Atom;
|
|
|
|
use std::cell::Cell;
|
|
use std::cmp::max;
|
|
|
|
const DEFAULT_COLSPAN: u32 = 1;
|
|
|
|
#[derive(Copy, Clone, Debug)]
|
|
#[jstraceable]
|
|
pub enum HTMLTableCellElementTypeId {
|
|
HTMLTableDataCellElement = 0,
|
|
HTMLTableHeaderCellElement = 1,
|
|
}
|
|
|
|
impl PartialEq for HTMLTableCellElementTypeId {
|
|
#[inline]
|
|
fn eq(&self, other: &HTMLTableCellElementTypeId) -> bool {
|
|
(*self as u8) == (*other as u8)
|
|
}
|
|
}
|
|
|
|
#[dom_struct]
|
|
pub struct HTMLTableCellElement {
|
|
htmlelement: HTMLElement,
|
|
background_color: Cell<Option<RGBA>>,
|
|
colspan: Cell<Option<u32>>,
|
|
width: Cell<LengthOrPercentageOrAuto>,
|
|
}
|
|
|
|
impl HTMLTableCellElementDerived for EventTarget {
|
|
fn is_htmltablecellelement(&self) -> bool {
|
|
match *self.type_id() {
|
|
EventTargetTypeId::Node(
|
|
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableCellElement(_)))) => true,
|
|
_ => false
|
|
}
|
|
}
|
|
}
|
|
|
|
impl HTMLTableCellElement {
|
|
pub fn new_inherited(type_id: HTMLTableCellElementTypeId,
|
|
tag_name: DOMString,
|
|
prefix: Option<DOMString>,
|
|
document: &Document)
|
|
-> HTMLTableCellElement {
|
|
HTMLTableCellElement {
|
|
htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLTableCellElement(type_id),
|
|
tag_name, prefix, document),
|
|
background_color: Cell::new(None),
|
|
colspan: Cell::new(None),
|
|
width: Cell::new(LengthOrPercentageOrAuto::Auto),
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn htmlelement(&self) -> &HTMLElement {
|
|
&self.htmlelement
|
|
}
|
|
}
|
|
|
|
impl<'a> HTMLTableCellElementMethods for &'a HTMLTableCellElement {
|
|
// https://html.spec.whatwg.org/multipage/#dom-tdth-colspan
|
|
make_uint_getter!(ColSpan, "colspan", DEFAULT_COLSPAN);
|
|
make_uint_setter!(SetColSpan, "colspan");
|
|
}
|
|
|
|
pub trait HTMLTableCellElementHelpers {
|
|
fn get_background_color(self) -> Option<RGBA>;
|
|
fn get_colspan(self) -> Option<u32>;
|
|
fn get_width(self) -> LengthOrPercentageOrAuto;
|
|
}
|
|
|
|
impl<'a> HTMLTableCellElementHelpers for &'a HTMLTableCellElement {
|
|
fn get_background_color(self) -> Option<RGBA> {
|
|
self.background_color.get()
|
|
}
|
|
|
|
fn get_colspan(self) -> Option<u32> {
|
|
self.colspan.get()
|
|
}
|
|
|
|
fn get_width(self) -> LengthOrPercentageOrAuto {
|
|
self.width.get()
|
|
}
|
|
}
|
|
|
|
impl<'a> VirtualMethods for &'a HTMLTableCellElement {
|
|
fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
|
|
let htmlelement: &&HTMLElement = HTMLElementCast::from_borrowed_ref(self);
|
|
Some(htmlelement as &VirtualMethods)
|
|
}
|
|
|
|
fn after_set_attr(&self, attr: &Attr) {
|
|
if let Some(ref s) = self.super_type() {
|
|
s.after_set_attr(attr);
|
|
}
|
|
|
|
match attr.local_name() {
|
|
&atom!("bgcolor") => {
|
|
self.background_color.set(str::parse_legacy_color(&attr.value()).ok())
|
|
}
|
|
&atom!("colspan") => {
|
|
match *attr.value() {
|
|
AttrValue::UInt(_, colspan) => {
|
|
self.colspan.set(Some(max(DEFAULT_COLSPAN, colspan)))
|
|
},
|
|
_ => unreachable!(),
|
|
}
|
|
},
|
|
&atom!("width") => self.width.set(str::parse_length(&attr.value())),
|
|
_ => ()
|
|
}
|
|
}
|
|
|
|
fn before_remove_attr(&self, attr: &Attr) {
|
|
if let Some(ref s) = self.super_type() {
|
|
s.before_remove_attr(attr);
|
|
}
|
|
|
|
match attr.local_name() {
|
|
&atom!("bgcolor") => self.background_color.set(None),
|
|
&atom!("colspan") => self.colspan.set(None),
|
|
&atom!("width") => self.width.set(LengthOrPercentageOrAuto::Auto),
|
|
_ => ()
|
|
}
|
|
}
|
|
|
|
fn parse_plain_attribute(&self, local_name: &Atom, value: DOMString) -> AttrValue {
|
|
match local_name {
|
|
&atom!("colspan") => AttrValue::from_u32(value, DEFAULT_COLSPAN),
|
|
_ => self.super_type().unwrap().parse_plain_attribute(local_name, value),
|
|
}
|
|
}
|
|
}
|
|
|