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/script_module.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/script_module.rs')
| -rw-r--r-- | components/script/script_module.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/script_module.rs b/components/script/script_module.rs index c6f18733bc1..b74dba2c65f 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -1745,9 +1745,10 @@ fn fetch_single_module_script( ModuleOwner::Worker(_) | ModuleOwner::DynamicModule(_) => None, ModuleOwner::Window(script) => Some(script.root().owner_document()), }; + let webview_id = document.as_ref().map(|document| document.webview_id()); // Step 7-8. - let request = RequestBuilder::new(url.clone(), global.get_referrer()) + let request = RequestBuilder::new(webview_id, url.clone(), global.get_referrer()) .destination(destination) .origin(global.origin().immutable().clone()) .parser_metadata(options.parser_metadata) |