mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Include WebViewId
into EmbedderMsg variants where possible (#35211)
`EmbedderMsg` was previously paired with an implicit `Option<WebViewId>`, even though almost all variants were either always `Some` or always `None`, depending on whether there was a `WebView involved. This patch adds the `WebViewId` to as many `EmbedderMsg` variants as possible, so we can call their associated `WebView` delegate methods without needing to check and unwrap the `Option`. In many cases, this required more changes to plumb through the `WebViewId`. Notably, all `Request`s now explicitly need a `WebView` or not, in order to ensure that it is passed when appropriate. Signed-off-by: Delan Azabani <dazabani@igalia.com> Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
9eeb602f7a
commit
5e9de2cb61
70 changed files with 809 additions and 753 deletions
|
@ -425,9 +425,21 @@ impl IOCompositor {
|
|||
Some(cursor) if cursor != self.cursor => cursor,
|
||||
_ => return,
|
||||
};
|
||||
let Some(webview_id) = self
|
||||
.pipeline_details(result.pipeline_id)
|
||||
.pipeline
|
||||
.as_ref()
|
||||
.map(|composition_pipeline| composition_pipeline.top_level_browsing_context_id)
|
||||
else {
|
||||
warn!(
|
||||
"Updating cursor for not-yet-rendered pipeline: {}",
|
||||
result.pipeline_id
|
||||
);
|
||||
return;
|
||||
};
|
||||
|
||||
self.cursor = cursor;
|
||||
let msg = ConstellationMsg::SetCursor(cursor);
|
||||
let msg = ConstellationMsg::SetCursor(webview_id, cursor);
|
||||
if let Err(e) = self.constellation_chan.send(msg) {
|
||||
warn!("Sending event to constellation failed ({:?}).", e);
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
use std::fmt::{Debug, Error, Formatter};
|
||||
use std::time::Duration;
|
||||
|
||||
use base::id::{PipelineId, TopLevelBrowsingContextId};
|
||||
use base::id::{PipelineId, TopLevelBrowsingContextId, WebViewId};
|
||||
use embedder_traits::{
|
||||
ClipboardEventType, EventLoopWaker, GamepadEvent, MediaSessionActionType, MouseButton, Theme,
|
||||
TouchEventType, TouchId, TraversalDirection, WheelDelta,
|
||||
|
@ -83,7 +83,7 @@ pub enum EmbedderEvent {
|
|||
/// Sent when the user exits from fullscreen mode
|
||||
ExitFullScreen(TopLevelBrowsingContextId),
|
||||
/// Sent when a key input state changes
|
||||
Keyboard(KeyboardEvent),
|
||||
Keyboard(WebViewId, KeyboardEvent),
|
||||
/// Sent for IME composition updates
|
||||
IMEComposition(CompositionEvent),
|
||||
/// Sent when Ctr+R/Apple+R is called to reload the current page.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue