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