diff options
author | Glenn Watson <github@intuitionlibrary.com> | 2016-10-07 16:13:01 +1000 |
---|---|---|
committer | Glenn Watson <github@intuitionlibrary.com> | 2016-10-08 06:00:00 +1000 |
commit | 291af9d11504f974828a7cf0cd5f6c89f9c6992e (patch) | |
tree | 864fd547cd81ad1cb47681f7de212723f304ed70 /components/script_traits/script_msg.rs | |
parent | b1c5b9182003cf56b0953a6a1aa01f47b49d3f14 (diff) | |
download | servo-291af9d11504f974828a7cf0cd5f6c89f9c6992e.tar.gz servo-291af9d11504f974828a7cf0cd5f6c89f9c6992e.zip |
Send touch events to root pipeline, and allow forwarding to iframes.
Instead of letting the compositor try to find the correct scroll
layer for a touch event, switch touch events to work the same way
that mouse events do.
Touch events are now dispatched to the root pipeline, and then
forwarded to child iframes as required.
Diffstat (limited to 'components/script_traits/script_msg.rs')
-rw-r--r-- | components/script_traits/script_msg.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index 52f5fdd1188..8b3283800df 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -3,10 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use AnimationState; +use CompositorEvent; use DocumentState; use IFrameLoadInfo; -use MouseButton; -use MouseEventType; use MozBrowserEvent; use WorkerGlobalScopeInit; use WorkerScriptLoadOrigin; @@ -72,10 +71,8 @@ pub enum ScriptMsg { IpcSender<Result<(IpcSender<CanvasMsg>, GLLimits), String>>), /// Notifies the constellation that this frame has received focus. Focus(PipelineId), - /// Re-send a mouse button event that was sent to the parent window. - ForwardMouseButtonEvent(PipelineId, MouseEventType, MouseButton, Point2D<f32>), - /// Re-send a mouse move event that was sent to the parent window. - ForwardMouseMoveEvent(PipelineId, Point2D<f32>), + /// Forward an event that was sent to the parent window. + ForwardEvent(PipelineId, CompositorEvent), /// Requests that the constellation retrieve the current contents of the clipboard GetClipboardContents(IpcSender<String>), /// <head> tag finished parsing |