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

Add more assertions to dispatch_event.

Browse source
This commit is contained in:
Ms2ger 2015-09-16 14:48:36 +02:00
parent 76eea43c83
commit b342dff07d
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/event.rs
View file

@ -19,7 +19,7 @@ use std::default::Default;
use time; use time;
#[derive(JSTraceable, Copy, Clone)] #[derive(JSTraceable, Copy, Clone, Debug, PartialEq, Eq)]
#[repr(u16)] #[repr(u16)]
#[derive(HeapSizeOf)] #[derive(HeapSizeOf)]
pub enum EventPhase { pub enum EventPhase {
@ -136,6 +136,11 @@ impl Event {
self.target.set(Some(JS::from_ref(val))); self.target.set(Some(JS::from_ref(val)));
} }
#[inline]
pub fn phase(&self) -> EventPhase {
self.phase.get()
}
#[inline] #[inline]
pub fn set_phase(&self, val: EventPhase) { pub fn set_phase(&self, val: EventPhase) {
self.phase.set(val) self.phase.set(val)

2
components/script/dom/eventdispatcher.rs
View file

@ -91,6 +91,8 @@ pub fn dispatch_event(target: &EventTarget, pseudo_target: Option<&EventTarget>,
event: &Event) -> bool { event: &Event) -> bool {
assert!(!event.dispatching()); assert!(!event.dispatching());
assert!(event.initialized()); assert!(event.initialized());
assert_eq!(event.phase(), EventPhase::None);
assert!(event.GetCurrentTarget().is_none());
event.set_target(match pseudo_target { event.set_target(match pseudo_target {
Some(pseudo_target) => pseudo_target, Some(pseudo_target) => pseudo_target,