ae3ff6be00
> 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
73 lines
2.4 KiB
Rust
73 lines
2.4 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::EventBinding::EventMethods;
|
|
use dom::bindings::codegen::Bindings::ProgressEventBinding;
|
|
use dom::bindings::codegen::Bindings::ProgressEventBinding::ProgressEventMethods;
|
|
use dom::bindings::codegen::InheritTypes::{EventCast, ProgressEventDerived};
|
|
use dom::bindings::error::Fallible;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::Root;
|
|
use dom::bindings::utils::reflect_dom_object;
|
|
use dom::event::{Event, EventTypeId};
|
|
use util::str::DOMString;
|
|
|
|
#[dom_struct]
|
|
pub struct ProgressEvent {
|
|
event: Event,
|
|
length_computable: bool,
|
|
loaded: u64,
|
|
total: u64
|
|
}
|
|
|
|
impl ProgressEventDerived for Event {
|
|
fn is_progressevent(&self) -> bool {
|
|
*self.type_id() == EventTypeId::ProgressEvent
|
|
}
|
|
}
|
|
|
|
impl ProgressEvent {
|
|
fn new_inherited(length_computable: bool, loaded: u64, total: u64) -> ProgressEvent {
|
|
ProgressEvent {
|
|
event: Event::new_inherited(EventTypeId::ProgressEvent),
|
|
length_computable: length_computable,
|
|
loaded: loaded,
|
|
total: total
|
|
}
|
|
}
|
|
pub fn new(global: GlobalRef, type_: DOMString,
|
|
can_bubble: bool, cancelable: bool,
|
|
length_computable: bool, loaded: u64, total: u64) -> Root<ProgressEvent> {
|
|
let ev = reflect_dom_object(box ProgressEvent::new_inherited(length_computable, loaded, total),
|
|
global,
|
|
ProgressEventBinding::Wrap);
|
|
{
|
|
let event = EventCast::from_ref(ev.r());
|
|
event.InitEvent(type_, can_bubble, cancelable);
|
|
}
|
|
ev
|
|
}
|
|
pub fn Constructor(global: GlobalRef,
|
|
type_: DOMString,
|
|
init: &ProgressEventBinding::ProgressEventInit)
|
|
-> Fallible<Root<ProgressEvent>> {
|
|
let ev = ProgressEvent::new(global, type_, init.parent.bubbles, init.parent.cancelable,
|
|
init.lengthComputable, init.loaded, init.total);
|
|
Ok(ev)
|
|
}
|
|
}
|
|
|
|
impl<'a> ProgressEventMethods for &'a ProgressEvent {
|
|
fn LengthComputable(self) -> bool {
|
|
self.length_computable
|
|
}
|
|
fn Loaded(self) -> u64{
|
|
self.loaded
|
|
}
|
|
fn Total(self) -> u64 {
|
|
self.total
|
|
}
|
|
}
|
|
|