Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

WebDriver: Wait focus to complete when switching window (#38160)

Browse source 
Previously the webdriver do not wait for focus to complete, which can
cause some instability.

No matter interact as human or webdriver, the focus chain always goes
as: Embedder forwards -> Constellation (do some updates) -> Embedder (do
some updates).

---------

Signed-off-by: Euclid Ye <euclid.ye@huawei.com>
This commit is contained in:
Euclid Ye 2025-07-21 12:18:21 +08:00 • committed by GitHub
parent 7c96084298
commit b0a29393a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/constellation/constellation.rs
View file

@ -1366,8 +1366,8 @@ where
}
self.handle_panic(webview_id, error, None);
},
EmbedderToConstellationMessage::FocusWebView(webview_id) => {
self.handle_focus_web_view(webview_id);
EmbedderToConstellationMessage::FocusWebView(webview_id, response_sender) => {
self.handle_focus_web_view(webview_id, response_sender);
},
EmbedderToConstellationMessage::BlurWebView => {
self.webviews.unfocus();
@ -2774,13 +2774,20 @@ where
}
#[servo_tracing::instrument(skip_all)]
fn handle_focus_web_view(&mut self, webview_id: WebViewId) {
fn handle_focus_web_view(
&mut self,
webview_id: WebViewId,
response_sender: Option<IpcSender<bool>>,
) {
if self.webviews.get(webview_id).is_none() {
if let Some(response_sender) = response_sender {
let _ = response_sender.send(false);
}
return warn!("{webview_id}: FocusWebView on unknown top-level browsing context");
}
self.webviews.focus(webview_id);
self.embedder_proxy
.send(EmbedderMsg::WebViewFocused(webview_id));
.send(EmbedderMsg::WebViewFocused(webview_id, response_sender));
}
#[servo_tracing::instrument(skip_all)]
@ -4152,7 +4159,7 @@ where
// Focus the top-level browsing context.
self.webviews.focus(webview_id);
self.embedder_proxy
.send(EmbedderMsg::WebViewFocused(webview_id));
.send(EmbedderMsg::WebViewFocused(webview_id, None));
// If a container with a non-null nested browsing context is focused,
// the nested browsing context's active document becomes the focused