forked from mirrors/gecko-dev
> 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
119 lines
4.4 KiB
Rust
119 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::cell::DOMRefCell;
|
|
use dom::bindings::codegen::Bindings::EventBinding::{EventMethods};
|
|
use dom::bindings::codegen::Bindings::StorageEventBinding;
|
|
use dom::bindings::codegen::Bindings::StorageEventBinding::{StorageEventMethods};
|
|
|
|
use dom::bindings::codegen::InheritTypes::{EventCast};
|
|
use dom::bindings::error::Fallible;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::{JS, MutNullableHeap, Root, RootedReference};
|
|
use dom::bindings::utils::{reflect_dom_object};
|
|
use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable};
|
|
use dom::storage::Storage;
|
|
use util::str::DOMString;
|
|
|
|
#[dom_struct]
|
|
pub struct StorageEvent {
|
|
event: Event,
|
|
key: DOMRefCell<Option<DOMString>>,
|
|
oldValue: DOMRefCell<Option<DOMString>>,
|
|
newValue: DOMRefCell<Option<DOMString>>,
|
|
url: DOMRefCell<DOMString>,
|
|
storageArea: MutNullableHeap<JS<Storage>>
|
|
}
|
|
|
|
|
|
impl StorageEvent {
|
|
pub fn new_inherited(type_id: EventTypeId,
|
|
key: Option<DOMString>,
|
|
oldValue: Option<DOMString>,
|
|
newValue: Option<DOMString>,
|
|
url: DOMString,
|
|
storageArea: Option<&Storage>) -> StorageEvent {
|
|
StorageEvent {
|
|
event: Event::new_inherited(type_id),
|
|
key: DOMRefCell::new(key),
|
|
oldValue: DOMRefCell::new(oldValue),
|
|
newValue: DOMRefCell::new(newValue),
|
|
url: DOMRefCell::new(url),
|
|
storageArea: MutNullableHeap::new(storageArea.map(JS::from_ref))
|
|
}
|
|
}
|
|
|
|
pub fn new(global: GlobalRef,
|
|
type_: DOMString,
|
|
bubbles: EventBubbles,
|
|
cancelable: EventCancelable,
|
|
key: Option<DOMString>,
|
|
oldValue: Option<DOMString>,
|
|
newValue: Option<DOMString>,
|
|
url: DOMString,
|
|
storageArea: Option<&Storage>) -> Root<StorageEvent> {
|
|
let ev = reflect_dom_object(box StorageEvent::new_inherited(EventTypeId::StorageEvent,
|
|
key, oldValue, newValue,
|
|
url, storageArea),
|
|
global,
|
|
StorageEventBinding::Wrap);
|
|
{
|
|
let event = EventCast::from_ref(ev.r());
|
|
event.InitEvent(type_, bubbles == EventBubbles::Bubbles, cancelable == EventCancelable::Cancelable);
|
|
}
|
|
ev
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef,
|
|
type_: DOMString,
|
|
init: &StorageEventBinding::StorageEventInit) -> Fallible<Root<StorageEvent>> {
|
|
let key = init.key.clone();
|
|
let oldValue = init.oldValue.clone();
|
|
let newValue = init.newValue.clone();
|
|
let url = init.url.clone();
|
|
let storageArea = init.storageArea.r();
|
|
let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
|
|
let cancelable = if init.parent.cancelable {
|
|
EventCancelable::Cancelable
|
|
} else {
|
|
EventCancelable::NotCancelable
|
|
};
|
|
let event = StorageEvent::new(global, type_,
|
|
bubbles, cancelable,
|
|
key, oldValue, newValue,
|
|
url, storageArea);
|
|
Ok(event)
|
|
}
|
|
}
|
|
|
|
impl<'a> StorageEventMethods for &'a StorageEvent {
|
|
fn GetKey(self) -> Option<DOMString> {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let key = self.key.borrow();
|
|
key.clone()
|
|
}
|
|
|
|
fn GetOldValue(self) -> Option<DOMString> {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let oldValue = self.oldValue.borrow();
|
|
oldValue.clone()
|
|
}
|
|
|
|
fn GetNewValue(self) -> Option<DOMString> {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let newValue = self.newValue.borrow();
|
|
newValue.clone()
|
|
}
|
|
|
|
fn Url(self) -> DOMString {
|
|
// FIXME(https://github.com/rust-lang/rust/issues/23338)
|
|
let url = self.url.borrow();
|
|
url.clone()
|
|
}
|
|
|
|
fn GetStorageArea(self) -> Option<Root<Storage>> {
|
|
self.storageArea.get().map(Root::from_rooted)
|
|
}
|
|
|
|
}
|