Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-27 23:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

webdriver: Elegantly handle "element screenshot" when bounding box has area zero (#39499)

Browse source 
It is possible that the bounding rectangle of an element has area 0.
This PR avoids panic in this case.

It is worth to mention that the panic itself won't kill the entire
program for interaction, but only the webdriver thread.

Testing: Manually tested on the case of #39495

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye 2025-09-27 10:20:35 +08:00 • committed by GitHub
parent 4c25039d35
commit 2e8fac9395
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/webdriver_server/lib.rs
View file

@ -2320,14 +2320,23 @@ impl Handler {
for _ in 0..iterations {
let (sender, receiver) = ipc::channel().unwrap();
self.send_message_to_embedder(WebDriverCommandMsg::TakeScreenshot(
webview_id, rect, sender,
))?;
if let Some(x) = wait_for_ipc_response(receiver)? {
img = Some(x);
break;
match wait_for_ipc_response(receiver)? {
Ok(output_img) => {
if let Some(x) = output_img {
img = Some(x);
break;
}
},
Err(()) => {
return Err(WebDriverError::new(
ErrorStatus::UnknownError,
"The bounding box of element has either 0 width or 0 height",
));
},
};
thread::sleep(Duration::from_millis(interval));
@ -2384,8 +2393,6 @@ impl Handler {
&self,
element: &WebElement,
) -> WebDriverResult<WebDriverResponse> {
let (sender, receiver) = ipc::channel().unwrap();
// Step 1. If session's current top-level browsing context is no longer open,
// return error with error code no such window.
let webview_id = self.webview_id()?;
@ -2394,7 +2401,9 @@ impl Handler {
// Step 2. Try to handle any user prompts with session.
self.handle_any_user_prompts(webview_id)?;
// Step 3 - 4
// Step 3. Trying to get element.
// Step 4. Scroll into view into element.
let (sender, receiver) = ipc::channel().unwrap();
let cmd =
WebDriverScriptCommand::ScrollAndGetBoundingClientRect(element.to_string(), sender);
self.browsing_context_script_command(cmd, VerifyBrowsingContextIsOpen::Yes)?;
@ -2409,7 +2418,7 @@ impl Handler {
serde_json::to_value(encoded)?,
)))
},
Err(error) => Err(WebDriverError::new(error, "Element not found")),
Err(error) => Err(WebDriverError::new(error, "")),
}
}