forked from mirrors/gecko-dev
7512d04e93
> 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
56 lines
1.7 KiB
Rust
56 lines
1.7 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::bindings::codegen::Bindings::DOMRectListBinding;
|
|
use dom::bindings::codegen::Bindings::DOMRectListBinding::DOMRectListMethods;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::{JS, Root};
|
|
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
|
use dom::domrect::DOMRect;
|
|
use dom::window::Window;
|
|
|
|
#[dom_struct]
|
|
pub struct DOMRectList {
|
|
reflector_: Reflector,
|
|
rects: Vec<JS<DOMRect>>,
|
|
window: JS<Window>,
|
|
}
|
|
|
|
impl DOMRectList {
|
|
fn new_inherited<T>(window: &Window, rects: T) -> DOMRectList
|
|
where T: Iterator<Item=Root<DOMRect>> {
|
|
DOMRectList {
|
|
reflector_: Reflector::new(),
|
|
rects: rects.map(|r| JS::from_rooted(&r)).collect(),
|
|
window: JS::from_ref(window),
|
|
}
|
|
}
|
|
|
|
pub fn new<T>(window: &Window, rects: T) -> Root<DOMRectList>
|
|
where T: Iterator<Item=Root<DOMRect>> {
|
|
reflect_dom_object(box DOMRectList::new_inherited(window, rects),
|
|
GlobalRef::Window(window), DOMRectListBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl<'a> DOMRectListMethods for &'a DOMRectList {
|
|
fn Length(self) -> u32 {
|
|
self.rects.len() as u32
|
|
}
|
|
|
|
fn Item(self, index: u32) -> Option<Root<DOMRect>> {
|
|
let rects = &self.rects;
|
|
if index < rects.len() as u32 {
|
|
Some(rects[index as usize].root())
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<DOMRect>> {
|
|
*found = index < self.rects.len() as u32;
|
|
self.Item(index)
|
|
}
|
|
}
|
|
|