diff options
| author | Delan Azabani <dazabani@igalia.com> | 2025-01-30 19:15:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-30 11:15:35 +0000 |
| commit | 5e9de2cb61fbfd82b27343bf03439838458b9848 (patch) | |
| tree | 64574624cda94237bbfc443a29b792229fde0ee2 /components/script/dom/workerglobalscope.rs | |
| parent | 9eeb602f7afca502753bb8211ab646c952951761 (diff) | |
| download | servo-5e9de2cb61fbfd82b27343bf03439838458b9848.tar.gz servo-5e9de2cb61fbfd82b27343bf03439838458b9848.zip | |
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>
Diffstat (limited to 'components/script/dom/workerglobalscope.rs')
| -rw-r--r-- | components/script/dom/workerglobalscope.rs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 7db2123e36e..94b709a4fa6 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -278,13 +278,17 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope { rooted!(in(self.runtime.borrow().as_ref().unwrap().cx()) let mut rval = UndefinedValue()); for url in urls { let global_scope = self.upcast::<GlobalScope>(); - let request = NetRequestInit::new(url.clone(), global_scope.get_referrer()) - .destination(Destination::Script) - .credentials_mode(CredentialsMode::Include) - .parser_metadata(ParserMetadata::NotParserInserted) - .use_url_credentials(true) - .origin(global_scope.origin().immutable().clone()) - .pipeline_id(Some(self.upcast::<GlobalScope>().pipeline_id())); + let request = NetRequestInit::new( + global_scope.webview_id(), + url.clone(), + global_scope.get_referrer(), + ) + .destination(Destination::Script) + .credentials_mode(CredentialsMode::Include) + .parser_metadata(ParserMetadata::NotParserInserted) + .use_url_credentials(true) + .origin(global_scope.origin().immutable().clone()) + .pipeline_id(Some(self.upcast::<GlobalScope>().pipeline_id())); let (url, source) = match fetch::load_whole_resource( request, |