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>

1 files changed, 17 insertions, 15 deletions

diff --git a/components/script/navigation.rs b/components/script/navigation.rs
index 1ec54ad397e..0ed58ba609f 100644
--- a/components/script/navigation.rs
+++ b/components/script/navigation.rs
@@ -192,21 +192,23 @@ impl InProgressLoad {
     pub(crate) fn request_builder(&mut self) -> RequestBuilder {
         let id = self.pipeline_id;
         let top_level_browsing_context_id = self.top_level_browsing_context_id;
-        let mut request_builder =
-            RequestBuilder::new(self.load_data.url.clone(), self.load_data.referrer.clone())
-                .method(self.load_data.method.clone())
-                .destination(Destination::Document)
-                .mode(RequestMode::Navigate)
-                .credentials_mode(CredentialsMode::Include)
-                .use_url_credentials(true)
-                .pipeline_id(Some(id))
-                .target_browsing_context_id(Some(top_level_browsing_context_id))
-                .referrer_policy(self.load_data.referrer_policy)
-                .headers(self.load_data.headers.clone())
-                .body(self.load_data.data.clone())
-                .redirect_mode(RedirectMode::Manual)
-                .origin(self.origin.immutable().clone())
-                .crash(self.load_data.crash.clone());
+        let mut request_builder = RequestBuilder::new(
+            Some(top_level_browsing_context_id),
+            self.load_data.url.clone(),
+            self.load_data.referrer.clone(),
+        )
+        .method(self.load_data.method.clone())
+        .destination(Destination::Document)
+        .mode(RequestMode::Navigate)
+        .credentials_mode(CredentialsMode::Include)
+        .use_url_credentials(true)
+        .pipeline_id(Some(id))
+        .referrer_policy(self.load_data.referrer_policy)
+        .headers(self.load_data.headers.clone())
+        .body(self.load_data.data.clone())
+        .redirect_mode(RedirectMode::Manual)
+        .origin(self.origin.immutable().clone())
+        .crash(self.load_data.crash.clone());
         request_builder.url_list = self.url_list.clone();
 
         if !request_builder.headers.contains_key(header::ACCEPT) {