> 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
144 lines
4.4 KiB
Rust
144 lines
4.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::ErrorEventBinding;
|
|
use dom::bindings::codegen::Bindings::ErrorEventBinding::ErrorEventMethods;
|
|
use dom::bindings::codegen::InheritTypes::{EventCast, ErrorEventDerived};
|
|
use dom::bindings::error::Fallible;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::{Root, MutHeapJSVal};
|
|
use js::jsapi::{JSContext, HandleValue};
|
|
use dom::bindings::trace::JSTraceable;
|
|
|
|
use dom::bindings::utils::reflect_dom_object;
|
|
use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable};
|
|
use util::str::DOMString;
|
|
|
|
use dom::bindings::cell::DOMRefCell;
|
|
use std::borrow::ToOwned;
|
|
use std::cell::Cell;
|
|
use js::jsval::JSVal;
|
|
|
|
#[dom_struct]
|
|
pub struct ErrorEvent {
|
|
event: Event,
|
|
message: DOMRefCell<DOMString>,
|
|
filename: DOMRefCell<DOMString>,
|
|
lineno: Cell<u32>,
|
|
colno: Cell<u32>,
|
|
error: MutHeapJSVal,
|
|
}
|
|
|
|
impl ErrorEventDerived for Event {
|
|
fn is_errorevent(&self) -> bool {
|
|
*self.type_id() == EventTypeId::ErrorEvent
|
|
}
|
|
}
|
|
|
|
impl ErrorEvent {
|
|
fn new_inherited(type_id: EventTypeId) -> ErrorEvent {
|
|
ErrorEvent {
|
|
event: Event::new_inherited(type_id),
|
|
message: DOMRefCell::new("".to_owned()),
|
|
filename: DOMRefCell::new("".to_owned()),
|
|
lineno: Cell::new(0),
|
|
colno: Cell::new(0),
|
|
error: MutHeapJSVal::new()
|
|
}
|
|
}
|
|
|
|
pub fn new_uninitialized(global: GlobalRef) -> Root<ErrorEvent> {
|
|
reflect_dom_object(box ErrorEvent::new_inherited(EventTypeId::ErrorEvent),
|
|
global,
|
|
ErrorEventBinding::Wrap)
|
|
}
|
|
|
|
pub fn new(global: GlobalRef,
|
|
type_: DOMString,
|
|
bubbles: EventBubbles,
|
|
cancelable: EventCancelable,
|
|
message: DOMString,
|
|
filename: DOMString,
|
|
lineno: u32,
|
|
colno: u32,
|
|
error: HandleValue) -> Root<ErrorEvent> {
|
|
let ev = ErrorEvent::new_uninitialized(global);
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
{
|
|
let ev = ev.r();
|
|
let event = EventCast::from_ref(ev);
|
|
event.InitEvent(type_, bubbles == EventBubbles::Bubbles,
|
|
cancelable == EventCancelable::Cancelable);
|
|
*ev.message.borrow_mut() = message;
|
|
*ev.filename.borrow_mut() = filename;
|
|
ev.lineno.set(lineno);
|
|
ev.colno.set(colno);
|
|
}
|
|
ev.error.set(error.get());
|
|
ev
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef,
|
|
type_: DOMString,
|
|
init: &ErrorEventBinding::ErrorEventInit) -> Fallible<Root<ErrorEvent>>{
|
|
let msg = match init.message.as_ref() {
|
|
Some(message) => message.clone(),
|
|
None => "".to_owned(),
|
|
};
|
|
|
|
let file_name = match init.filename.as_ref() {
|
|
None => "".to_owned(),
|
|
Some(filename) => filename.clone(),
|
|
};
|
|
|
|
let line_num = init.lineno.unwrap_or(0);
|
|
|
|
let col_num = init.colno.unwrap_or(0);
|
|
|
|
let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
|
|
|
|
let cancelable = if init.parent.cancelable {
|
|
EventCancelable::Cancelable
|
|
} else {
|
|
EventCancelable::NotCancelable
|
|
};
|
|
|
|
let event = ErrorEvent::new(global, type_,
|
|
bubbles, cancelable,
|
|
msg, file_name,
|
|
line_num, col_num,
|
|
HandleValue { ptr: &init.error });
|
|
Ok(event)
|
|
}
|
|
|
|
}
|
|
|
|
impl<'a> ErrorEventMethods for &'a ErrorEvent {
|
|
fn Lineno(self) -> u32 {
|
|
self.lineno.get()
|
|
}
|
|
|
|
fn Colno(self) -> u32 {
|
|
self.colno.get()
|
|
}
|
|
|
|
fn Message(self) -> DOMString {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let message = self.message.borrow();
|
|
message.clone()
|
|
}
|
|
|
|
fn Filename(self) -> DOMString {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let filename = self.filename.borrow();
|
|
filename.clone()
|
|
}
|
|
|
|
fn Error(self, _cx: *mut JSContext) -> JSVal {
|
|
self.error.get()
|
|
}
|
|
|
|
}
|