liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm2: `EventPhase` and `PropagationMode` should be `Eq`

This commit is contained in:
David Wendt 2020-12-14 17:26:55 -05:00 committed by Mike Welsh
parent 6caaf0d222
commit f7f51dcde2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/avm2/events.rs
View File

@ -5,7 +5,7 @@ use crate::avm2::string::AvmString;
use gc_arena::Collect; use gc_arena::Collect;
/// Which phase of event dispatch is currently occurring. /// Which phase of event dispatch is currently occurring.
#[derive(Copy, Clone, Collect, Debug)] #[derive(Copy, Clone, Collect, Debug, PartialEq, Eq)]
#[collect(require_static)] #[collect(require_static)]
pub enum EventPhase { pub enum EventPhase {
/// The event has yet to be fired on the target and is descending the /// The event has yet to be fired on the target and is descending the
@ -31,7 +31,7 @@ impl Into<u32> for EventPhase {
} }
/// How this event is allowed to propagate. /// How this event is allowed to propagate.
#[derive(Copy, Clone, Collect, Debug)] #[derive(Copy, Clone, Collect, Debug, PartialEq, Eq)]
#[collect(require_static)] #[collect(require_static)]
pub enum PropagationMode { pub enum PropagationMode {
/// Propagate events normally. /// Propagate events normally.
@ -132,17 +132,17 @@ impl<'gc> Event<'gc> {
} }
pub fn is_propagation_stopped(&self) -> bool { pub fn is_propagation_stopped(&self) -> bool {
!matches!(self.propagation, PropagationMode::AllowPropagation) self.propagation != PropagationMode::AllowPropagation
} }
pub fn stop_propagation(&mut self) { pub fn stop_propagation(&mut self) {
if !matches!(self.propagation, PropagationMode::StopImmediatePropagation) { if self.propagation != PropagationMode::StopImmediatePropagation {
self.propagation = PropagationMode::StopPropagation; self.propagation = PropagationMode::StopPropagation;
} }
} }
pub fn is_propagation_stopped_immediately(&self) -> bool { pub fn is_propagation_stopped_immediately(&self) -> bool {
matches!(self.propagation, PropagationMode::StopImmediatePropagation) self.propagation == PropagationMode::StopImmediatePropagation
} }
pub fn stop_immediate_propagation(&mut self) { pub fn stop_immediate_propagation(&mut self) {