mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 14:20:14 +02:00
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
105 lines
3.4 KiB
Rust
105 lines
3.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::MessageEventBinding;
|
|
use dom::bindings::codegen::Bindings::MessageEventBinding::MessageEventMethods;
|
|
use dom::bindings::codegen::InheritTypes::{EventCast, MessageEventDerived};
|
|
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, EventHelpers, EventTypeId};
|
|
use dom::eventtarget::EventTarget;
|
|
|
|
use util::str::DOMString;
|
|
|
|
use js::jsapi::{JSContext, Heap, HandleValue};
|
|
use js::jsval::JSVal;
|
|
|
|
use std::borrow::ToOwned;
|
|
use std::default::Default;
|
|
|
|
#[dom_struct]
|
|
pub struct MessageEvent {
|
|
event: Event,
|
|
data: Heap<JSVal>,
|
|
origin: DOMString,
|
|
lastEventId: DOMString,
|
|
}
|
|
|
|
impl MessageEventDerived for Event {
|
|
fn is_messageevent(&self) -> bool {
|
|
*self.type_id() == EventTypeId::MessageEvent
|
|
}
|
|
}
|
|
|
|
impl MessageEvent {
|
|
pub fn new_uninitialized(global: GlobalRef) -> Root<MessageEvent> {
|
|
MessageEvent::new_initialized(global, HandleValue::undefined(), "".to_owned(), "".to_owned())
|
|
}
|
|
|
|
pub fn new_initialized(global: GlobalRef,
|
|
data: HandleValue,
|
|
origin: DOMString,
|
|
lastEventId: DOMString) -> Root<MessageEvent> {
|
|
let mut ev = box MessageEvent {
|
|
event: Event::new_inherited(EventTypeId::MessageEvent),
|
|
data: Heap::default(),
|
|
origin: origin,
|
|
lastEventId: lastEventId,
|
|
};
|
|
ev.data.set(data.get());
|
|
reflect_dom_object(ev, global, MessageEventBinding::Wrap)
|
|
}
|
|
|
|
pub fn new(global: GlobalRef, type_: DOMString,
|
|
bubbles: bool, cancelable: bool,
|
|
data: HandleValue, origin: DOMString, lastEventId: DOMString)
|
|
-> Root<MessageEvent> {
|
|
let ev = MessageEvent::new_initialized(global, data, origin, lastEventId);
|
|
{
|
|
let event = EventCast::from_ref(ev.r());
|
|
event.InitEvent(type_, bubbles, cancelable);
|
|
}
|
|
ev
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef,
|
|
type_: DOMString,
|
|
init: &MessageEventBinding::MessageEventInit)
|
|
-> Fallible<Root<MessageEvent>> {
|
|
let ev = MessageEvent::new(global, type_, init.parent.bubbles, init.parent.cancelable,
|
|
HandleValue { ptr: &init.data },
|
|
init.origin.clone(), init.lastEventId.clone());
|
|
Ok(ev)
|
|
}
|
|
}
|
|
|
|
impl MessageEvent {
|
|
pub fn dispatch_jsval(target: &EventTarget,
|
|
scope: GlobalRef,
|
|
message: HandleValue) {
|
|
let messageevent = MessageEvent::new(
|
|
scope, "message".to_owned(), false, false, message,
|
|
"".to_owned(), "".to_owned());
|
|
let event = EventCast::from_ref(messageevent.r());
|
|
event.fire(target);
|
|
}
|
|
}
|
|
|
|
impl<'a> MessageEventMethods for &'a MessageEvent {
|
|
fn Data(self, _cx: *mut JSContext) -> JSVal {
|
|
self.data.get()
|
|
}
|
|
|
|
fn Origin(self) -> DOMString {
|
|
self.origin.clone()
|
|
}
|
|
|
|
fn LastEventId(self) -> DOMString {
|
|
self.lastEventId.clone()
|
|
}
|
|
}
|
|
|