mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +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:
Delan Azabani
GitHub
parent
9eeb602f7a
commit
5e9de2cb61
70 changed files with 809 additions and 753 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue