forked from mirrors/gecko-dev
da092febcb
The existing `Rooted` and `RootedVec` users were migrated the the following two macros: ```rust let x = Rooted::new(cx, value); // Was changed to: rooted!(in(cx) let x = value); // Which expands to: let mut __root = Rooted::new_unrooted(value); let x = RootedGuard::new(cx, &mut __root); ``` ```rust let mut v = RootedVec::new(); v.extend(iterator); // Was changed to: rooted_vec!(let v <- iterator); // Which expands to: let mut __root = RootableVec::new(); let v = RootedVec::new(&mut __root, iterator); ``` The `rooted!` macro depends on servo/rust-mozjs#272. These APIs based on two types, a container to be rooted and a rooting guard, allow implementing both `Rooted`-style rooting and `Traceable`-based rooting in stable Rust, without abusing `return_address`. Such macros may have been tried before, but in 1.9 their hygiene is broken, they work only since 1.10. Sadly, `Rooted` is a FFI type and completely exposed, so I cannot prevent anyone from creating their own, although all fields but the value get overwritten by `RootedGuard::new` anyway. `RootableVec` OTOH is *guaranteed* to be empty when not rooted, which makes it harmless AFAICT. By fixing rust-lang/rust#34227, this PR enables Servo to build with `-Zorbit`. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix rust-lang/rust#34227 - [x] These changes do not require tests because they are not functional changes Source-Repo: https://github.com/servo/servo Source-Revision: 80cb0cf8214fd52d2884724614c40cb278ee7575
108 lines
3.8 KiB
Rust
108 lines
3.8 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::error::Fallible;
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::js::Root;
|
|
use dom::bindings::reflector::reflect_dom_object;
|
|
use dom::bindings::str::DOMString;
|
|
use dom::event::Event;
|
|
use dom::eventtarget::EventTarget;
|
|
use js::jsapi::{HandleValue, Heap, JSContext};
|
|
use js::jsval::JSVal;
|
|
use std::default::Default;
|
|
use string_cache::Atom;
|
|
|
|
#[dom_struct]
|
|
pub struct MessageEvent {
|
|
event: Event,
|
|
data: Heap<JSVal>,
|
|
origin: DOMString,
|
|
lastEventId: DOMString,
|
|
}
|
|
|
|
impl MessageEvent {
|
|
pub fn new_uninitialized(global: GlobalRef) -> Root<MessageEvent> {
|
|
MessageEvent::new_initialized(global,
|
|
HandleValue::undefined(),
|
|
DOMString::new(),
|
|
DOMString::new())
|
|
}
|
|
|
|
pub fn new_initialized(global: GlobalRef,
|
|
data: HandleValue,
|
|
origin: DOMString,
|
|
lastEventId: DOMString) -> Root<MessageEvent> {
|
|
let mut ev = box MessageEvent {
|
|
event: Event::new_inherited(),
|
|
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_: Atom,
|
|
bubbles: bool, cancelable: bool,
|
|
data: HandleValue, origin: DOMString, lastEventId: DOMString)
|
|
-> Root<MessageEvent> {
|
|
let ev = MessageEvent::new_initialized(global, data, origin, lastEventId);
|
|
{
|
|
let event = ev.upcast::<Event>();
|
|
event.init_event(type_, bubbles, cancelable);
|
|
}
|
|
ev
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef,
|
|
type_: DOMString,
|
|
init: &MessageEventBinding::MessageEventInit)
|
|
-> Fallible<Root<MessageEvent>> {
|
|
// Dictionaries need to be rooted
|
|
// https://github.com/servo/servo/issues/6381
|
|
rooted!(in(global.get_cx()) let data = init.data);
|
|
let ev = MessageEvent::new(global, Atom::from(type_), init.parent.bubbles, init.parent.cancelable,
|
|
data.handle(),
|
|
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, atom!("message"), false, false, message,
|
|
DOMString::new(), DOMString::new());
|
|
messageevent.upcast::<Event>().fire(target);
|
|
}
|
|
}
|
|
|
|
impl MessageEventMethods for MessageEvent {
|
|
// https://html.spec.whatwg.org/multipage/#dom-messageevent-data
|
|
fn Data(&self, _cx: *mut JSContext) -> JSVal {
|
|
self.data.get()
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-messageevent-origin
|
|
fn Origin(&self) -> DOMString {
|
|
self.origin.clone()
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-messageevent-lasteventid
|
|
fn LastEventId(&self) -> DOMString {
|
|
self.lastEventId.clone()
|
|
}
|
|
|
|
// https://dom.spec.whatwg.org/#dom-event-istrusted
|
|
fn IsTrusted(&self) -> bool {
|
|
self.event.IsTrusted()
|
|
}
|
|
}
|