diff options
Diffstat (limited to 'components/shared')
| -rw-r--r-- | components/shared/compositing/constellation_msg.rs | 2 | ||||
| -rw-r--r-- | components/shared/compositing/lib.rs | 6 | ||||
| -rw-r--r-- | components/shared/embedder/webdriver.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/components/shared/compositing/constellation_msg.rs b/components/shared/compositing/constellation_msg.rs index a07b943d7e6..412cfcba32a 100644 --- a/components/shared/compositing/constellation_msg.rs +++ b/components/shared/compositing/constellation_msg.rs @@ -62,7 +62,7 @@ pub enum ConstellationMsg { /// Make none of the webviews focused. BlurWebView, /// Forward an input event to an appropriate ScriptTask. - ForwardInputEvent(InputEvent, Option<CompositorHitTestResult>), + ForwardInputEvent(WebViewId, InputEvent, Option<CompositorHitTestResult>), /// Requesting a change to the onscreen cursor. SetCursor(WebViewId, Cursor), /// Enable the sampling profiler, with a given sampling rate and max total sampling duration. diff --git a/components/shared/compositing/lib.rs b/components/shared/compositing/lib.rs index 737b105b1ba..ddca92a3c57 100644 --- a/components/shared/compositing/lib.rs +++ b/components/shared/compositing/lib.rs @@ -65,7 +65,7 @@ pub enum CompositorMsg { /// Remove a webview. RemoveWebView(TopLevelBrowsingContextId), /// Script has handled a touch event, and either prevented or allowed default actions. - TouchEventProcessed(TouchEventResult), + TouchEventProcessed(WebViewId, TouchEventResult), /// Composite to a PNG file and return the Image over a passed channel. CreatePng(Option<Rect<f32, CSSPixel>>, IpcSender<Option<Image>>), /// A reply to the compositor asking if the output image is stable. @@ -89,9 +89,9 @@ pub enum CompositorMsg { /// The load of a page has completed LoadComplete(TopLevelBrowsingContextId), /// WebDriver mouse button event - WebDriverMouseButtonEvent(MouseButtonAction, MouseButton, f32, f32), + WebDriverMouseButtonEvent(WebViewId, MouseButtonAction, MouseButton, f32, f32), /// WebDriver mouse move event - WebDriverMouseMoveEvent(f32, f32), + WebDriverMouseMoveEvent(WebViewId, f32, f32), /// Messages forwarded to the compositor by the constellation from other crates. These /// messages are mainly passed on from the compositor to WebRender. diff --git a/components/shared/embedder/webdriver.rs b/components/shared/embedder/webdriver.rs index 1da996038a8..349a45edf1b 100644 --- a/components/shared/embedder/webdriver.rs +++ b/components/shared/embedder/webdriver.rs @@ -41,9 +41,9 @@ pub enum WebDriverCommandMsg { /// Act as if keys were pressed or release in the browsing context with the given ID. KeyboardAction(BrowsingContextId, KeyboardEvent), /// Act as if the mouse was clicked in the browsing context with the given ID. - MouseButtonAction(MouseButtonAction, MouseButton, f32, f32), + MouseButtonAction(WebViewId, MouseButtonAction, MouseButton, f32, f32), /// Act as if the mouse was moved in the browsing context with the given ID. - MouseMoveAction(f32, f32), + MouseMoveAction(WebViewId, f32, f32), /// Set the window size. SetWindowSize(WebViewId, DeviceIntSize, IpcSender<Size2D<f32, CSSPixel>>), /// Take a screenshot of the window. |