mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +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
|
@ -255,7 +255,7 @@ impl WebSocketMethods<crate::DomTypeHolder> for WebSocket {
|
|||
let ws = WebSocket::new(global, proto, url_record.clone(), dom_action_sender, can_gc);
|
||||
let address = Trusted::new(&*ws);
|
||||
|
||||
let request = RequestBuilder::new(url_record, Referrer::NoReferrer)
|
||||
let request = RequestBuilder::new(global.webview_id(), url_record, Referrer::NoReferrer)
|
||||
.origin(global.origin().immutable().clone())
|
||||
.mode(RequestMode::WebSocket { protocols });
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue