Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Include WebViewId into EmbedderMsg variants where possible (#35211)

Browse source 
`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:
Delan Azabani 2025-01-30 19:15:35 +08:00 • committed by GitHub
parent 9eeb602f7a
commit 5e9de2cb61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
70 changed files with 809 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/net/filemanager_thread.rs
View file

@ -10,6 +10,7 @@ use std::path::{Path, PathBuf};
use std::sync::atomic::{self, AtomicBool, AtomicUsize, Ordering};
use std::sync::{Arc, Mutex, RwLock, Weak};
use base::id::WebViewId;
use embedder_traits::{EmbedderMsg, EmbedderProxy, FilterPattern};
use headers::{ContentLength, ContentRange, ContentType, HeaderMap, HeaderMapExt, Range};
use http::header::{self, HeaderValue};
@ -153,14 +154,14 @@ impl FileManager {
/// Message handler
pub fn handle(&self, msg: FileManagerThreadMsg) {
match msg {
FileManagerThreadMsg::SelectFile(filter, sender, origin, opt_test_path) => {
FileManagerThreadMsg::SelectFile(webview_id, filter, sender, origin, opt_test_path) => {
let store = self.store.clone();
let embedder = self.embedder_proxy.clone();
self.thread_pool
.upgrade()
.map(|pool| {
pool.spawn(move || {
store.select_file(filter, sender, origin, opt_test_path, embedder);
store.select_file(webview_id, filter, sender, origin, opt_test_path, embedder);
});
})
.unwrap_or_else(|| {
@ -169,14 +170,20 @@ impl FileManager {
);
});
},
FileManagerThreadMsg::SelectFiles(filter, sender, origin, opt_test_paths) => {
FileManagerThreadMsg::SelectFiles(
webview_id,
filter,
sender,
origin,
opt_test_paths,
) => {
let store = self.store.clone();
let embedder = self.embedder_proxy.clone();
self.thread_pool
.upgrade()
.map(|pool| {
pool.spawn(move || {
store.select_files(filter, sender, origin, opt_test_paths, embedder);
store.select_files(webview_id, filter, sender, origin, opt_test_paths, embedder);
});
})
.unwrap_or_else(|| {
@ -571,17 +578,18 @@ impl FileManagerStore {
fn query_files_from_embedder(
&self,
webview_id: WebViewId,
patterns: Vec<FilterPattern>,
multiple_files: bool,
embedder_proxy: EmbedderProxy,
) -> Option<Vec<String>> {
let (ipc_sender, ipc_receiver) = ipc::channel().expect("Failed to create IPC channel!");
let msg = (
None,
EmbedderMsg::SelectFiles(patterns, multiple_files, ipc_sender),
);
embedder_proxy.send(msg);
embedder_proxy.send(EmbedderMsg::SelectFiles(
webview_id,
patterns,
multiple_files,
ipc_sender,
));
match ipc_receiver.recv() {
Ok(result) => result,
Err(e) => {
@ -593,6 +601,7 @@ impl FileManagerStore {
fn select_file(
&self,
webview_id: WebViewId,
patterns: Vec<FilterPattern>,
sender: IpcSender<FileManagerResult<SelectedFile>>,
origin: FileOrigin,
@ -605,7 +614,7 @@ impl FileManagerStore {
let opt_s = if pref!(dom_testing_html_input_element_select_files_enabled) {
opt_test_path
} else {
self.query_files_from_embedder(patterns, false, embedder_proxy)
self.query_files_from_embedder(webview_id, patterns, false, embedder_proxy)
.and_then(|mut x| x.pop())
};
@ -623,6 +632,7 @@ impl FileManagerStore {
fn select_files(
&self,
webview_id: WebViewId,
patterns: Vec<FilterPattern>,
sender: IpcSender<FileManagerResult<Vec<SelectedFile>>>,
origin: FileOrigin,
@ -635,7 +645,7 @@ impl FileManagerStore {
let opt_v = if pref!(dom_testing_html_input_element_select_files_enabled) {
opt_test_paths
} else {
self.query_files_from_embedder(patterns, true, embedder_proxy)
self.query_files_from_embedder(webview_id, patterns, true, embedder_proxy)
};
match opt_v {