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_thread.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_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 9e3b94e91af..e0c839588fb 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -1052,7 +1052,7 @@ impl ScriptThread { let url = document.url(); url.join(&value).map(|url| url.to_string()).ok() }); - let event = EmbedderMsg::Status(status); + let event = EmbedderMsg::Status(window.webview_id(), status); window.send_to_embedder(event); state_already_changed = true; @@ -1069,7 +1069,7 @@ impl ScriptThread { .next() .is_some() { - let event = EmbedderMsg::Status(None); + let event = EmbedderMsg::Status(window.webview_id(), None); window.send_to_embedder(event); } } @@ -3101,9 +3101,9 @@ impl ScriptThread { let layout_config = LayoutConfig { id: incomplete.pipeline_id, + webview_id: incomplete.top_level_browsing_context_id, url: final_url.clone(), is_iframe: incomplete.parent_info.is_some(), - constellation_chan: self.senders.layout_to_constellation_ipc_sender.clone(), script_chan: self.senders.constellation_sender.clone(), image_cache: self.image_cache.clone(), font_context: font_context.clone(), @@ -3115,6 +3115,7 @@ impl ScriptThread { // Create the window and document objects. let window = Window::new( + incomplete.top_level_browsing_context_id, self.js_runtime.clone(), self.senders.self_sender.clone(), self.layout_factory.create(layout_config), |