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, 8 insertions, 4 deletions

diff --git a/components/script/layout_image.rs b/components/script/layout_image.rs
index cbfc68943ab..0696b400224 100644
--- a/components/script/layout_image.rs
+++ b/components/script/layout_image.rs
@@ -106,10 +106,14 @@ pub(crate) fn fetch_image_for_layout(
         url: url.clone(),
     };
 
-    let request = FetchRequestInit::new(url, document.global().get_referrer())
-        .origin(document.origin().immutable().clone())
-        .destination(Destination::Image)
-        .pipeline_id(Some(document.global().pipeline_id()));
+    let request = FetchRequestInit::new(
+        Some(document.webview_id()),
+        url,
+        document.global().get_referrer(),
+    )
+    .origin(document.origin().immutable().clone())
+    .destination(Destination::Image)
+    .pipeline_id(Some(document.global().pipeline_id()));
 
     // Layout image loads do not delay the document load event.
     document.fetch_background(request, context);