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

Return an enum instead of a boolean from dispatch_event

Browse source 
Fixes #13196
This commit is contained in:
Adolfo Ochagavía 2016-09-23 17:51:24 +02:00
parent 821797d6f7
commit 6c8bfdb774
7 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -19,6 +19,7 @@ use dom::bindings::str::DOMString;
use dom::bindings::structuredclone::StructuredCloneData;
use dom::errorevent::ErrorEvent;
use dom::event::{Event, EventBubbles, EventCancelable};
use dom::eventdispatcher::EventStatus;
use dom::eventtarget::EventTarget;
use dom::messageevent::MessageEvent;
use dom::worker::{TrustedWorkerAddress, WorkerErrorHandler, WorkerMessageHandler};
@ -370,8 +371,10 @@ impl DedicatedWorkerGlobalScope {
value);
// Step 13.
let handled = !event.upcast::<Event>().fire(self.upcast::<EventTarget>());
if !handled {
let event_status = event.upcast::<Event>().fire(self.upcast::<EventTarget>());
// Step 15
if event_status == EventStatus::NotCanceled {
let worker = self.worker.borrow().as_ref().unwrap().clone();
// TODO: Should use the DOM manipulation task source.
self.parent_sender
@ -380,6 +383,7 @@ impl DedicatedWorkerGlobalScope {
.unwrap();
}
// Step 14
self.in_error_reporting_mode.set(false);
}
}