diff options
Diffstat (limited to 'components/shared/script/script_msg.rs')
| -rw-r--r-- | components/shared/script/script_msg.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/shared/script/script_msg.rs b/components/shared/script/script_msg.rs index f3f3a417898..9321b623cbd 100644 --- a/components/shared/script/script_msg.rs +++ b/components/shared/script/script_msg.rs @@ -14,7 +14,7 @@ use base::Epoch; use canvas_traits::canvas::{CanvasId, CanvasMsg}; use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use embedder_traits::{ - EmbedderMsg, MediaSessionEvent, TouchAction, TouchEventType, TraversalDirection, + EmbedderMsg, MediaSessionEvent, TouchEventType, TouchSequenceId, TraversalDirection, }; use euclid::default::Size2D as UntypedSize2D; use euclid::Size2D; @@ -62,13 +62,13 @@ impl fmt::Debug for LayoutMsg { } } -/// Whether a DOM event was prevented by web content +/// Whether the default action for a touch event was prevented by web content #[derive(Debug, Deserialize, Serialize)] -pub enum EventResult { +pub enum TouchEventResult { /// Allowed by web content - DefaultAllowed(TouchAction), + DefaultAllowed(TouchSequenceId, TouchEventType), /// Prevented by web content - DefaultPrevented(TouchEventType), + DefaultPrevented(TouchSequenceId, TouchEventType), } /// A log entry reported to the constellation @@ -217,7 +217,7 @@ pub enum ScriptMsg { /// Update the pipeline Url, which can change after redirections. SetFinalUrl(ServoUrl), /// Script has handled a touch event, and either prevented or allowed default actions. - TouchEventProcessed(EventResult), + TouchEventProcessed(TouchEventResult), /// A log entry, with the top-level browsing context id and thread name LogEntry(Option<String>, LogEntry), /// Discard the document. |