mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +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
|
@ -195,18 +195,6 @@ pub fn should_request_be_blocked_by_csp(
|
|||
.unwrap_or(csp::CheckResult::Allowed)
|
||||
}
|
||||
|
||||
pub fn maybe_intercept_request(
|
||||
request: &mut Request,
|
||||
context: &FetchContext,
|
||||
response: &mut Option<Response>,
|
||||
) {
|
||||
context
|
||||
.request_intercepter
|
||||
.lock()
|
||||
.unwrap()
|
||||
.intercept_request(request, response, context);
|
||||
}
|
||||
|
||||
/// [Main fetch](https://fetch.spec.whatwg.org/#concept-main-fetch)
|
||||
pub async fn main_fetch(
|
||||
fetch_params: &mut FetchParams,
|
||||
|
@ -314,7 +302,11 @@ pub async fn main_fetch(
|
|||
let current_scheme = current_url.scheme();
|
||||
|
||||
// Intercept the request and maybe override the response.
|
||||
maybe_intercept_request(request, context, &mut response);
|
||||
context
|
||||
.request_intercepter
|
||||
.lock()
|
||||
.unwrap()
|
||||
.intercept_request(request, &mut response, context);
|
||||
|
||||
let mut response = match response {
|
||||
Some(res) => res,
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -9,7 +9,7 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
|
|||
|
||||
use async_recursion::async_recursion;
|
||||
use base::cross_process_instant::CrossProcessInstant;
|
||||
use base::id::{HistoryStateId, PipelineId, TopLevelBrowsingContextId};
|
||||
use base::id::{HistoryStateId, PipelineId, WebViewId};
|
||||
use crossbeam_channel::Sender;
|
||||
use devtools_traits::{
|
||||
ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest,
|
||||
|
@ -1583,10 +1583,12 @@ async fn http_network_or_cache_fetch(
|
|||
|
||||
// Step 14.3 If request’s use-URL-credentials flag is unset or isAuthenticationFetch is true, then:
|
||||
if !http_request.use_url_credentials || authentication_fetch_flag {
|
||||
let Some(credentials) = prompt_user_for_credentials(
|
||||
&context.state.embedder_proxy,
|
||||
http_request.target_browsing_context_id,
|
||||
) else {
|
||||
let Some(webview_id) = http_request.target_webview_id else {
|
||||
return response;
|
||||
};
|
||||
let Some(credentials) =
|
||||
prompt_user_for_credentials(&context.state.embedder_proxy, webview_id)
|
||||
else {
|
||||
return response;
|
||||
};
|
||||
let Some(username) = credentials.username else {
|
||||
|
@ -1639,10 +1641,12 @@ async fn http_network_or_cache_fetch(
|
|||
|
||||
// Step 15.4 Prompt the end user as appropriate in request’s window
|
||||
// window and store the result as a proxy-authentication entry.
|
||||
let Some(credentials) = prompt_user_for_credentials(
|
||||
&context.state.embedder_proxy,
|
||||
http_request.target_browsing_context_id,
|
||||
) else {
|
||||
let Some(webview_id) = http_request.target_webview_id else {
|
||||
return response;
|
||||
};
|
||||
let Some(credentials) =
|
||||
prompt_user_for_credentials(&context.state.embedder_proxy, webview_id)
|
||||
else {
|
||||
return response;
|
||||
};
|
||||
let Some(user_name) = credentials.username else {
|
||||
|
@ -1779,18 +1783,16 @@ impl Drop for ResponseEndTimer {
|
|||
|
||||
fn prompt_user_for_credentials(
|
||||
embedder_proxy: &Mutex<EmbedderProxy>,
|
||||
top_level_browsing_context_id: Option<TopLevelBrowsingContextId>,
|
||||
webview_id: WebViewId,
|
||||
) -> Option<PromptCredentialsInput> {
|
||||
let proxy = embedder_proxy.lock().unwrap();
|
||||
|
||||
let (ipc_sender, ipc_receiver) = ipc::channel().unwrap();
|
||||
|
||||
proxy.send((
|
||||
top_level_browsing_context_id,
|
||||
EmbedderMsg::Prompt(
|
||||
PromptDefinition::Credentials(ipc_sender),
|
||||
PromptOrigin::Trusted,
|
||||
),
|
||||
proxy.send(EmbedderMsg::Prompt(
|
||||
webview_id,
|
||||
PromptDefinition::Credentials(ipc_sender),
|
||||
PromptOrigin::Trusted,
|
||||
));
|
||||
|
||||
let Ok(credentials) = ipc_receiver.recv() else {
|
||||
|
@ -2100,21 +2102,25 @@ async fn cors_preflight_fetch(
|
|||
context: &FetchContext,
|
||||
) -> Response {
|
||||
// Step 1
|
||||
let mut preflight = RequestBuilder::new(request.current_url(), request.referrer.clone())
|
||||
.method(Method::OPTIONS)
|
||||
.origin(match &request.origin {
|
||||
Origin::Client => {
|
||||
unreachable!("We shouldn't get Client origin in cors_preflight_fetch.")
|
||||
},
|
||||
Origin::Origin(origin) => origin.clone(),
|
||||
})
|
||||
.pipeline_id(request.pipeline_id)
|
||||
.initiator(request.initiator)
|
||||
.destination(request.destination)
|
||||
.referrer_policy(request.referrer_policy)
|
||||
.mode(RequestMode::CorsMode)
|
||||
.response_tainting(ResponseTainting::CorsTainting)
|
||||
.build();
|
||||
let mut preflight = RequestBuilder::new(
|
||||
request.target_webview_id,
|
||||
request.current_url(),
|
||||
request.referrer.clone(),
|
||||
)
|
||||
.method(Method::OPTIONS)
|
||||
.origin(match &request.origin {
|
||||
Origin::Client => {
|
||||
unreachable!("We shouldn't get Client origin in cors_preflight_fetch.")
|
||||
},
|
||||
Origin::Origin(origin) => origin.clone(),
|
||||
})
|
||||
.pipeline_id(request.pipeline_id)
|
||||
.initiator(request.initiator)
|
||||
.destination(request.destination)
|
||||
.referrer_policy(request.referrer_policy)
|
||||
.mode(RequestMode::CorsMode)
|
||||
.response_tainting(ResponseTainting::CorsTainting)
|
||||
.build();
|
||||
|
||||
// Step 2
|
||||
preflight
|
||||
|
|
|
@ -40,9 +40,10 @@ impl RequestIntercepter {
|
|||
request.redirect_count > 0,
|
||||
);
|
||||
|
||||
self.embedder_proxy.send((
|
||||
request.target_browsing_context_id,
|
||||
EmbedderMsg::WebResourceRequested(req, tx),
|
||||
self.embedder_proxy.send(EmbedderMsg::WebResourceRequested(
|
||||
request.target_webview_id,
|
||||
req,
|
||||
tx,
|
||||
));
|
||||
let mut response_received = false;
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ fn assert_parse(
|
|||
use net_traits::request::RequestBuilder;
|
||||
|
||||
let url = ServoUrl::parse(url).unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.pipeline_id(None)
|
||||
.build();
|
||||
|
|
|
@ -65,7 +65,7 @@ fn test_fetch_response_is_not_network_error() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -79,7 +79,7 @@ fn test_fetch_response_is_not_network_error() {
|
|||
#[test]
|
||||
fn test_fetch_on_bad_port_is_network_error() {
|
||||
let url = ServoUrl::parse("http://www.example.org:6667").unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -101,7 +101,7 @@ fn test_fetch_response_body_matches_const_message() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -121,7 +121,7 @@ fn test_fetch_response_body_matches_const_message() {
|
|||
#[test]
|
||||
fn test_fetch_aboutblank() {
|
||||
let url = ServoUrl::parse("about:blank").unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
|
||||
|
@ -186,7 +186,7 @@ fn test_fetch_blob() {
|
|||
);
|
||||
let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.simple())).unwrap();
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(origin.origin())
|
||||
.build();
|
||||
|
||||
|
@ -228,7 +228,7 @@ fn test_file() {
|
|||
.unwrap();
|
||||
let url = ServoUrl::from_file_path(path.clone()).unwrap();
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
|
||||
|
@ -271,7 +271,7 @@ fn test_file() {
|
|||
#[test]
|
||||
fn test_fetch_ftp() {
|
||||
let url = ServoUrl::parse("ftp://not-supported").unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -281,7 +281,7 @@ fn test_fetch_ftp() {
|
|||
#[test]
|
||||
fn test_fetch_bogus_scheme() {
|
||||
let url = ServoUrl::parse("bogus://whatever").unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -330,7 +330,7 @@ fn test_cors_preflight_fetch() {
|
|||
let (server, url) = make_server(handler);
|
||||
|
||||
let target_url = url.clone().join("a.html").unwrap();
|
||||
let mut request = RequestBuilder::new(url, Referrer::ReferrerUrl(target_url)).build();
|
||||
let mut request = RequestBuilder::new(None, url, Referrer::ReferrerUrl(target_url)).build();
|
||||
request.referrer_policy = ReferrerPolicy::Origin;
|
||||
request.use_cors_preflight = true;
|
||||
request.mode = RequestMode::CorsMode;
|
||||
|
@ -383,7 +383,7 @@ fn test_cors_preflight_cache_fetch() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let mut request = RequestBuilder::new(url, Referrer::NoReferrer).build();
|
||||
let mut request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
|
||||
request.use_cors_preflight = true;
|
||||
request.mode = RequestMode::CorsMode;
|
||||
let wrapped_request0 = request.clone();
|
||||
|
@ -448,7 +448,7 @@ fn test_cors_preflight_fetch_network_error() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let mut request = RequestBuilder::new(url, Referrer::NoReferrer).build();
|
||||
let mut request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
|
||||
request.method = Method::from_bytes(b"CHICKEN").unwrap();
|
||||
request.use_cors_preflight = true;
|
||||
request.mode = RequestMode::CorsMode;
|
||||
|
@ -477,7 +477,7 @@ fn test_fetch_response_is_basic_filtered() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -542,7 +542,7 @@ fn test_fetch_response_is_cors_filtered() {
|
|||
let (server, url) = make_server(handler);
|
||||
|
||||
// an origin mis-match will stop it from defaulting to a basic filtered response
|
||||
let mut request = RequestBuilder::new(url, Referrer::NoReferrer).build();
|
||||
let mut request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
|
||||
request.mode = RequestMode::CorsMode;
|
||||
let fetch_response = fetch(request, None);
|
||||
let _ = server.close();
|
||||
|
@ -576,7 +576,7 @@ fn test_fetch_response_is_opaque_filtered() {
|
|||
let (server, url) = make_server(handler);
|
||||
|
||||
// an origin mis-match will fall through to an Opaque filtered response
|
||||
let request = RequestBuilder::new(url, Referrer::NoReferrer).build();
|
||||
let request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
|
||||
let fetch_response = fetch(request, None);
|
||||
let _ = server.close();
|
||||
|
||||
|
@ -624,7 +624,7 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
|
|||
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
request.redirect_mode = RedirectMode::Manual;
|
||||
|
@ -660,7 +660,7 @@ fn test_fetch_with_local_urls_only() {
|
|||
let (server, server_url) = make_server(handler);
|
||||
|
||||
let do_fetch = |url: ServoUrl| {
|
||||
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
|
||||
|
@ -728,7 +728,7 @@ fn test_fetch_with_hsts() {
|
|||
HstsEntry::new("localhost".to_owned(), IncludeSubdomains::NotIncluded, None).unwrap(),
|
||||
);
|
||||
}
|
||||
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
// Set the flag.
|
||||
|
@ -782,7 +782,7 @@ fn test_load_adds_host_to_hsts_list_when_url_is_https() {
|
|||
context.state.override_manager.add_override(certificate);
|
||||
}
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -838,7 +838,7 @@ fn test_fetch_self_signed() {
|
|||
protocols: Arc::new(ProtocolRegistry::default()),
|
||||
};
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -859,7 +859,7 @@ fn test_fetch_self_signed() {
|
|||
context.state.override_manager.add_override(certificate);
|
||||
}
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -884,7 +884,7 @@ fn test_fetch_with_sri_network_error() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
// To calulate hash use :
|
||||
|
@ -910,7 +910,7 @@ fn test_fetch_with_sri_sucess() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
// To calulate hash use :
|
||||
|
@ -952,7 +952,7 @@ fn test_fetch_blocked_nosniff() {
|
|||
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.destination(destination)
|
||||
.build();
|
||||
|
@ -999,7 +999,7 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
|
|||
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -1089,7 +1089,7 @@ fn test_fetch_redirect_updates_method_runner(
|
|||
|
||||
let (server, url) = crate::make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.method(method)
|
||||
.build();
|
||||
|
@ -1174,7 +1174,7 @@ fn test_fetch_async_returns_complete_response() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
@ -1194,7 +1194,7 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
|
|||
let (server, url) = make_server(handler);
|
||||
|
||||
// an origin mis-match will fall through to an Opaque filtered response
|
||||
let request = RequestBuilder::new(url, Referrer::NoReferrer).build();
|
||||
let request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
|
||||
let fetch_response = fetch(request, None);
|
||||
|
||||
let _ = server.close();
|
||||
|
@ -1228,7 +1228,7 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
|
|||
};
|
||||
|
||||
let (server, url) = make_server(handler);
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.redirect_mode(RedirectMode::Manual)
|
||||
.build();
|
||||
|
@ -1253,7 +1253,7 @@ fn test_fetch_with_devtools() {
|
|||
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.redirect_mode(RedirectMode::Manual)
|
||||
.pipeline_id(Some(TEST_PIPELINE_ID))
|
||||
|
@ -1341,12 +1341,13 @@ fn test_fetch_request_intercepted() {
|
|||
static HEADERVALUE: &str = "custom-value";
|
||||
static STATUS_MESSAGE: &[u8] = b"custom status message";
|
||||
|
||||
let (embedder_proxy, mut embedder_receiver) = create_embedder_proxy_and_receiver();
|
||||
let (embedder_proxy, embedder_receiver) = create_embedder_proxy_and_receiver();
|
||||
|
||||
std::thread::spawn(move || {
|
||||
let (_browser_context_id, embedder_msg) = embedder_receiver.recv_embedder_msg();
|
||||
let embedder_msg = embedder_receiver.recv().unwrap();
|
||||
match embedder_msg {
|
||||
embedder_traits::EmbedderMsg::WebResourceRequested(
|
||||
_,
|
||||
web_resource_request,
|
||||
response_sender,
|
||||
) => {
|
||||
|
@ -1396,7 +1397,7 @@ fn test_fetch_request_intercepted() {
|
|||
};
|
||||
|
||||
let url = ServoUrl::parse("http://www.example.org").unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
let response = fetch_with_context(request, &mut context);
|
||||
|
|
|
@ -7,6 +7,7 @@ use std::io::Read;
|
|||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
use base::id::TEST_WEBVIEW_ID;
|
||||
use embedder_traits::FilterPattern;
|
||||
use ipc_channel::ipc;
|
||||
use net::filemanager_thread::FileManager;
|
||||
|
@ -44,6 +45,7 @@ fn test_filemanager() {
|
|||
// Try to select a dummy file "components/net/tests/test.jpeg"
|
||||
let (tx, rx) = ipc::channel().unwrap();
|
||||
filemanager.handle(FileManagerThreadMsg::SelectFile(
|
||||
TEST_WEBVIEW_ID,
|
||||
patterns.clone(),
|
||||
tx,
|
||||
origin.clone(),
|
||||
|
|
|
@ -20,7 +20,7 @@ fn test_refreshing_resource_sets_done_chan_the_appropriate_value() {
|
|||
ResponseBody::Done(vec![]),
|
||||
];
|
||||
let url = ServoUrl::parse("https://servo.org").unwrap();
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.pipeline_id(Some(TEST_PIPELINE_ID))
|
||||
.origin(url.origin())
|
||||
.build();
|
||||
|
|
|
@ -10,7 +10,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
|
|||
use std::sync::{Arc, Mutex, RwLock};
|
||||
use std::time::Duration;
|
||||
|
||||
use base::id::TEST_PIPELINE_ID;
|
||||
use base::id::{TEST_PIPELINE_ID, TEST_WEBVIEW_ID};
|
||||
use cookie::Cookie as CookiePair;
|
||||
use crossbeam_channel::{unbounded, Receiver};
|
||||
use devtools_traits::{
|
||||
|
@ -175,7 +175,7 @@ fn test_check_default_headers_loaded_in_every_request() {
|
|||
*expected_headers.lock().unwrap() = Some(headers.clone());
|
||||
|
||||
// Testing for method.GET
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(url.clone().origin())
|
||||
|
@ -201,7 +201,7 @@ fn test_check_default_headers_loaded_in_every_request() {
|
|||
HeaderValue::from_str(&url_str[..url_str.len() - 1]).unwrap(),
|
||||
);
|
||||
*expected_headers.lock().unwrap() = Some(post_headers);
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::POST)
|
||||
.destination(Destination::Document)
|
||||
.origin(url.clone().origin())
|
||||
|
@ -231,7 +231,7 @@ fn test_load_when_request_is_not_get_or_head_and_there_is_no_body_content_length
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::POST)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -264,7 +264,7 @@ fn test_request_and_response_data_with_network_messages() {
|
|||
|
||||
let mut request_headers = HeaderMap::new();
|
||||
request_headers.typed_insert(Host::from("bar.foo".parse::<Authority>().unwrap()));
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.headers(request_headers)
|
||||
.body(None)
|
||||
|
@ -377,7 +377,7 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -417,7 +417,7 @@ fn test_redirected_request_to_devtools() {
|
|||
};
|
||||
let (pre_server, pre_url) = make_server(pre_handler);
|
||||
|
||||
let request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, pre_url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::POST)
|
||||
.destination(Destination::Document)
|
||||
.pipeline_id(Some(TEST_PIPELINE_ID))
|
||||
|
@ -470,7 +470,7 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() {
|
|||
};
|
||||
let (pre_server, pre_url) = make_server(pre_handler);
|
||||
|
||||
let request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, pre_url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::POST)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -502,7 +502,7 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -537,7 +537,7 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -584,7 +584,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
|
|||
let content = b"Body on POST!";
|
||||
let request_body = create_request_body_with_content(content.to_vec());
|
||||
|
||||
let request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, pre_url.clone(), Referrer::NoReferrer)
|
||||
.body(Some(request_body))
|
||||
.method(Method::POST)
|
||||
.destination(Destination::Document)
|
||||
|
@ -614,7 +614,7 @@ fn test_load_doesnt_add_host_to_hsts_list_when_url_is_http_even_if_hsts_headers_
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -661,7 +661,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
|
|||
|
||||
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -714,7 +714,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
|
|||
cookie_jar.push(cookie, &url, CookieSource::HTTP);
|
||||
}
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -761,7 +761,7 @@ fn test_load_sends_cookie_if_nonhttp() {
|
|||
cookie_jar.push(cookie, &url, CookieSource::HTTP);
|
||||
}
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -800,7 +800,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
|
|||
|
||||
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -849,7 +849,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
|
|||
|
||||
assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -884,7 +884,7 @@ fn test_load_sets_content_length_to_length_of_request_body() {
|
|||
|
||||
let request_body = create_request_body_with_content(content.to_vec());
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::POST)
|
||||
.body(Some(request_body))
|
||||
.destination(Destination::Document)
|
||||
|
@ -924,7 +924,7 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() {
|
|||
|
||||
let mut accept_headers = HeaderMap::new();
|
||||
accept_headers.insert(header::ACCEPT, HeaderValue::from_static("text/html"));
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.headers(accept_headers)
|
||||
.destination(Destination::Document)
|
||||
|
@ -962,7 +962,7 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -1001,7 +1001,7 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() {
|
|||
|
||||
let mut accept_encoding_headers = HeaderMap::new();
|
||||
accept_encoding_headers.insert(header::ACCEPT_ENCODING, HeaderValue::from_static("chunked"));
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.headers(accept_encoding_headers)
|
||||
.destination(Destination::Document)
|
||||
|
@ -1039,7 +1039,7 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -1095,7 +1095,7 @@ fn test_load_errors_when_there_a_redirect_loop() {
|
|||
|
||||
*url_b_for_a.lock().unwrap() = Some(url_b.clone());
|
||||
|
||||
let request = RequestBuilder::new(url_a.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url_a.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -1155,7 +1155,7 @@ fn test_load_succeeds_with_a_redirect_loop() {
|
|||
|
||||
*url_b_for_a.lock().unwrap() = Some(url_b.clone());
|
||||
|
||||
let request = RequestBuilder::new(url_a.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url_a.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -1198,7 +1198,7 @@ fn test_load_follows_a_redirect() {
|
|||
};
|
||||
let (pre_server, pre_url) = make_server(pre_handler);
|
||||
|
||||
let request = RequestBuilder::new(pre_url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, pre_url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -1283,7 +1283,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
|
|||
cookie_jar.push(cookie_y, &url_y, CookieSource::HTTP);
|
||||
}
|
||||
|
||||
let request = RequestBuilder::new(url_x.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url_x.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -1334,7 +1334,7 @@ fn test_redirect_from_x_to_x_provides_x_with_cookie_from_first_response() {
|
|||
|
||||
let url = url.join("/initial/").unwrap();
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.destination(Destination::Document)
|
||||
.origin(mock_origin())
|
||||
|
@ -1367,7 +1367,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -1412,7 +1412,7 @@ fn test_auth_ui_needs_www_auth() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -1479,7 +1479,7 @@ fn test_fetch_compressed_response_update_count() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -1565,7 +1565,7 @@ fn test_user_credentials_prompt_when_proxy_authentication_is_required() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(Some(TEST_WEBVIEW_ID), url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -1613,7 +1613,7 @@ fn test_prompt_credentials_when_client_receives_unauthorized_response() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(Some(TEST_WEBVIEW_ID), url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -1660,7 +1660,7 @@ fn test_prompt_credentials_user_cancels_dialog_input() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(Some(TEST_WEBVIEW_ID), url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
@ -1703,7 +1703,7 @@ fn test_prompt_credentials_user_input_incorrect_credentials() {
|
|||
};
|
||||
let (server, url) = make_server(handler);
|
||||
|
||||
let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(Some(TEST_WEBVIEW_ID), url.clone(), Referrer::NoReferrer)
|
||||
.method(Method::GET)
|
||||
.body(None)
|
||||
.destination(Destination::Document)
|
||||
|
|
|
@ -26,9 +26,9 @@ use std::net::TcpListener as StdTcpListener;
|
|||
use std::path::{Path, PathBuf};
|
||||
use std::sync::{Arc, LazyLock, Mutex, RwLock, Weak};
|
||||
|
||||
use crossbeam_channel::{unbounded, Sender};
|
||||
use crossbeam_channel::{unbounded, Receiver, Sender};
|
||||
use devtools_traits::DevtoolsControlMsg;
|
||||
use embedder_traits::{EmbedderProxy, EmbedderReceiver, EventLoopWaker};
|
||||
use embedder_traits::{EmbedderMsg, EmbedderProxy, EventLoopWaker};
|
||||
use futures::future::ready;
|
||||
use http_body_util::combinators::BoxBody;
|
||||
use http_body_util::{BodyExt, Empty, Full};
|
||||
|
@ -96,7 +96,7 @@ fn create_embedder_proxy() -> EmbedderProxy {
|
|||
}
|
||||
}
|
||||
|
||||
fn create_embedder_proxy_and_receiver() -> (EmbedderProxy, EmbedderReceiver) {
|
||||
fn create_embedder_proxy_and_receiver() -> (EmbedderProxy, Receiver<EmbedderMsg>) {
|
||||
let (sender, receiver) = unbounded();
|
||||
let event_loop_waker = || {
|
||||
struct DummyEventLoopWaker {}
|
||||
|
@ -120,19 +120,18 @@ fn create_embedder_proxy_and_receiver() -> (EmbedderProxy, EmbedderReceiver) {
|
|||
event_loop_waker: event_loop_waker(),
|
||||
};
|
||||
|
||||
let embedder_receiver = EmbedderReceiver { receiver };
|
||||
(embedder_proxy, embedder_receiver)
|
||||
(embedder_proxy, receiver)
|
||||
}
|
||||
|
||||
fn receive_credential_prompt_msgs(
|
||||
mut embedder_receiver: EmbedderReceiver,
|
||||
embedder_receiver: Receiver<EmbedderMsg>,
|
||||
username: Option<String>,
|
||||
password: Option<String>,
|
||||
) -> std::thread::JoinHandle<()> {
|
||||
std::thread::spawn(move || loop {
|
||||
let (_browser_context_id, embedder_msg) = embedder_receiver.recv_embedder_msg();
|
||||
let embedder_msg = embedder_receiver.recv().unwrap();
|
||||
match embedder_msg {
|
||||
embedder_traits::EmbedderMsg::Prompt(prompt_definition, _prompt_origin) => {
|
||||
embedder_traits::EmbedderMsg::Prompt(_, prompt_definition, _prompt_origin) => {
|
||||
match prompt_definition {
|
||||
embedder_traits::PromptDefinition::Credentials(ipc_sender) => {
|
||||
ipc_sender
|
||||
|
@ -143,7 +142,7 @@ fn receive_credential_prompt_msgs(
|
|||
}
|
||||
break;
|
||||
},
|
||||
embedder_traits::EmbedderMsg::WebResourceRequested(_, _) => {},
|
||||
embedder_traits::EmbedderMsg::WebResourceRequested(..) => {},
|
||||
_ => unreachable!(),
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue