mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00: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
|
@ -217,16 +217,16 @@ mod from_script {
|
|||
Self::WebResourceRequested(..) => target_variant!("WebResourceRequested"),
|
||||
Self::AllowUnload(..) => target_variant!("AllowUnload"),
|
||||
Self::Keyboard(..) => target_variant!("Keyboard"),
|
||||
Self::ClearClipboardContents => target_variant!("ClearClipboardContents"),
|
||||
Self::ClearClipboardContents(..) => target_variant!("ClearClipboardContents"),
|
||||
Self::GetClipboardContents(..) => target_variant!("GetClipboardContents"),
|
||||
Self::SetClipboardContents(..) => target_variant!("SetClipboardContents"),
|
||||
Self::SetCursor(..) => target_variant!("SetCursor"),
|
||||
Self::NewFavicon(..) => target_variant!("NewFavicon"),
|
||||
Self::HeadParsed => target_variant!("HeadParsed"),
|
||||
Self::HeadParsed(..) => target_variant!("HeadParsed"),
|
||||
Self::HistoryChanged(..) => target_variant!("HistoryChanged"),
|
||||
Self::SetFullscreenState(..) => target_variant!("SetFullscreenState"),
|
||||
Self::LoadStart => target_variant!("LoadStart"),
|
||||
Self::LoadComplete => target_variant!("LoadComplete"),
|
||||
Self::LoadStart(..) => target_variant!("LoadStart"),
|
||||
Self::LoadComplete(..) => target_variant!("LoadComplete"),
|
||||
Self::Panic(..) => target_variant!("Panic"),
|
||||
Self::GetSelectedBluetoothDevice(..) => {
|
||||
target_variant!("GetSelectedBluetoothDevice")
|
||||
|
@ -234,11 +234,12 @@ mod from_script {
|
|||
Self::SelectFiles(..) => target_variant!("SelectFiles"),
|
||||
Self::PromptPermission(..) => target_variant!("PromptPermission"),
|
||||
Self::ShowIME(..) => target_variant!("ShowIME"),
|
||||
Self::HideIME => target_variant!("HideIME"),
|
||||
Self::HideIME(..) => target_variant!("HideIME"),
|
||||
Self::Shutdown => target_variant!("Shutdown"),
|
||||
Self::ReportProfile(..) => target_variant!("ReportProfile"),
|
||||
Self::MediaSessionEvent(..) => target_variant!("MediaSessionEvent"),
|
||||
Self::OnDevtoolsStarted(..) => target_variant!("OnDevtoolsStarted"),
|
||||
Self::RequestDevtoolsConnection(..) => target_variant!("RequestDevtoolsConnection"),
|
||||
Self::ReadyToPresent(..) => target_variant!("ReadyToPresent"),
|
||||
Self::EventDelivered(..) => target_variant!("EventDelivered"),
|
||||
Self::PlayGamepadHapticEffect(..) => target_variant!("PlayGamepadHapticEffect"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue