mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +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
|
@ -7,6 +7,7 @@ use std::ops::Range;
|
|||
use std::path::PathBuf;
|
||||
use std::time::SystemTime;
|
||||
|
||||
use base::id::WebViewId;
|
||||
use embedder_traits::FilterPattern;
|
||||
use ipc_channel::ipc::IpcSender;
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
|
@ -136,6 +137,7 @@ pub struct SelectedFile {
|
|||
pub enum FileManagerThreadMsg {
|
||||
/// Select a single file. Last field is pre-selected file path for testing
|
||||
SelectFile(
|
||||
WebViewId,
|
||||
Vec<FilterPattern>,
|
||||
IpcSender<FileManagerResult<SelectedFile>>,
|
||||
FileOrigin,
|
||||
|
@ -144,6 +146,7 @@ pub enum FileManagerThreadMsg {
|
|||
|
||||
/// Select multiple files. Last field is pre-selected file paths for testing
|
||||
SelectFiles(
|
||||
WebViewId,
|
||||
Vec<FilterPattern>,
|
||||
IpcSender<FileManagerResult<Vec<SelectedFile>>>,
|
||||
FileOrigin,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue