Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use ExtendableMessageEvent for messageerror in service workers

Browse source
This commit is contained in:
Kyle Nosar 2020-07-19 11:15:47 -07:00
parent b1bd409047
commit 95ddcf5d4d
3 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/dom/extendablemessageevent.rs
View file

@ -28,11 +28,16 @@ use servo_atoms::Atom;
#[dom_struct] #[dom_struct]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub struct ExtendableMessageEvent { pub struct ExtendableMessageEvent {
/// https://w3c.github.io/ServiceWorker/#extendableevent
event: ExtendableEvent, event: ExtendableEvent,
/// https://w3c.github.io/ServiceWorker/#dom-extendablemessageevent-data
#[ignore_malloc_size_of = "mozjs"] #[ignore_malloc_size_of = "mozjs"]
data: Heap<JSVal>, data: Heap<JSVal>,
/// <https://w3c.github.io/ServiceWorker/#extendablemessage-event-origin>
origin: DOMString, origin: DOMString,
/// https://w3c.github.io/ServiceWorker/#dom-extendablemessageevent-lasteventid
lastEventId: DOMString, lastEventId: DOMString,
/// https://w3c.github.io/ServiceWorker/#dom-extendablemessageevent-ports
ports: Vec<Dom<MessagePort>>, ports: Vec<Dom<MessagePort>>,
#[ignore_malloc_size_of = "mozjs"] #[ignore_malloc_size_of = "mozjs"]
frozen_ports: DomRefCell<Option<Heap<JSVal>>>, frozen_ports: DomRefCell<Option<Heap<JSVal>>>,
@ -95,8 +100,8 @@ impl ExtendableMessageEvent {
init.parent.parent.bubbles, init.parent.parent.bubbles,
init.parent.parent.cancelable, init.parent.parent.cancelable,
init.data.handle(), init.data.handle(),
init.origin.clone().unwrap(), init.origin.clone(),
init.lastEventId.clone().unwrap(), init.lastEventId.clone(),
vec![], vec![],
); );
Ok(ev) Ok(ev)
@ -123,6 +128,21 @@ impl ExtendableMessageEvent {
); );
Extendablemessageevent.upcast::<Event>().fire(target); Extendablemessageevent.upcast::<Event>().fire(target);
} }
pub fn dispatch_error(target: &EventTarget, scope: &GlobalScope) {
let init = ExtendableMessageEventBinding::ExtendableMessageEventInit::empty();
let ExtendableMsgEvent = ExtendableMessageEvent::new(
scope,
atom!("messageerror"),
init.parent.parent.bubbles,
init.parent.parent.cancelable,
init.data.handle(),
init.origin.clone(),
init.lastEventId.clone(),
init.ports.clone(),
);
ExtendableMsgEvent.upcast::<Event>().fire(target);
}
} }
impl ExtendableMessageEventMethods for ExtendableMessageEvent { impl ExtendableMessageEventMethods for ExtendableMessageEvent {

3
components/script/dom/serviceworkerglobalscope.rs
View file

@ -19,7 +19,6 @@ use crate::dom::extendableevent::ExtendableEvent;
use crate::dom::extendablemessageevent::ExtendableMessageEvent; use crate::dom::extendablemessageevent::ExtendableMessageEvent;
use crate::dom::globalscope::GlobalScope; use crate::dom::globalscope::GlobalScope;
use crate::dom::identityhub::Identities; use crate::dom::identityhub::Identities;
use crate::dom::messageevent::MessageEvent;
use crate::dom::worker::TrustedWorkerAddress; use crate::dom::worker::TrustedWorkerAddress;
use crate::dom::workerglobalscope::WorkerGlobalScope; use crate::dom::workerglobalscope::WorkerGlobalScope;
use crate::fetch::load_whole_resource; use crate::fetch::load_whole_resource;
@ -446,7 +445,7 @@ impl ServiceWorkerGlobalScope {
ports, ports,
); );
} else { } else {
MessageEvent::dispatch_error(target, scope.upcast()); ExtendableMessageEvent::dispatch_error(target, scope.upcast());
} }
}, },
CommonWorker(WorkerScriptMsg::Common(msg)) => { CommonWorker(WorkerScriptMsg::Common(msg)) => {

8
components/script/dom/webidls/ExtendableMessageEvent.webidl
View file

@ -16,9 +16,9 @@ interface ExtendableMessageEvent : ExtendableEvent {
}; };
dictionary ExtendableMessageEventInit : ExtendableEventInit { dictionary ExtendableMessageEventInit : ExtendableEventInit {
any data; any data = null;
DOMString origin; DOMString origin = "";
DOMString lastEventId; DOMString lastEventId = "";
// (Client or ServiceWorker /*or MessagePort*/)? source; // (Client or ServiceWorker /*or MessagePort*/)? source;
// sequence<MessagePort>? ports; sequence<MessagePort> ports = [];
}; };