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

Set proper button value in WebDriver - ElementClick command (#36871)

Browse source 
Fix ElementClick: `ElementClick` should use `MouseButton::Left` to
create `action`.

Testing: No pass test now. Tests still fail because of other issues.
For: https://github.com/servo/servo/issues/36658

cc: @xiaochengh , @yezhizhen , @PotatoCP

Signed-off-by: batu_hoang <longvatrong111@gmail.com>
This commit is contained in:
batu_hoang 2025-05-07 16:58:01 +08:00 • committed by GitHub
parent eaf9224799
commit b2e51820e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/shared/embedder/input_events.rs
View file

@ -61,15 +61,16 @@ pub enum MouseButton {
Other(u16), Other(u16),
} }
impl From<u16> for MouseButton { impl<T: Into<u64>> From<T> for MouseButton {
fn from(value: u16) -> Self { fn from(value: T) -> Self {
let value = value.into();
match value { match value {
0 => MouseButton::Left, 0 => MouseButton::Left,
1 => MouseButton::Middle, 1 => MouseButton::Middle,
2 => MouseButton::Right, 2 => MouseButton::Right,
3 => MouseButton::Back, 3 => MouseButton::Back,
4 => MouseButton::Forward, 4 => MouseButton::Forward,
_ => MouseButton::Other(value), _ => MouseButton::Other(value as u16),
} }
} }
} }

6
components/webdriver_server/actions.rs
View file

@ -305,11 +305,10 @@ impl Handler {
}, },
}); });
let button = (action.button as u16).into();
let cmd_msg = WebDriverCommandMsg::MouseButtonAction( let cmd_msg = WebDriverCommandMsg::MouseButtonAction(
session.webview_id, session.webview_id,
MouseButtonAction::Down, MouseButtonAction::Down,
button, action.button.into(),
pointer_input_state.x as f32, pointer_input_state.x as f32,
pointer_input_state.y as f32, pointer_input_state.y as f32,
); );
@ -351,11 +350,10 @@ impl Handler {
}, },
}); });
let button = (action.button as u16).into();
let cmd_msg = WebDriverCommandMsg::MouseButtonAction( let cmd_msg = WebDriverCommandMsg::MouseButtonAction(
session.webview_id, session.webview_id,
MouseButtonAction::Up, MouseButtonAction::Up,
button, action.button.into(),
pointer_input_state.x as f32, pointer_input_state.x as f32,
pointer_input_state.y as f32, pointer_input_state.y as f32,
); );

25
components/webdriver_server/lib.rs
View file

@ -23,7 +23,7 @@ use constellation_traits::{EmbedderToConstellationMessage, TraversalDirection};
use cookie::{CookieBuilder, Expiration}; use cookie::{CookieBuilder, Expiration};
use crossbeam_channel::{Receiver, Sender, after, select, unbounded}; use crossbeam_channel::{Receiver, Sender, after, select, unbounded};
use embedder_traits::{ use embedder_traits::{
WebDriverCommandMsg, WebDriverCookieError, WebDriverFrameId, WebDriverJSError, MouseButton, WebDriverCommandMsg, WebDriverCookieError, WebDriverFrameId, WebDriverJSError,
WebDriverJSResult, WebDriverJSValue, WebDriverLoadStatus, WebDriverScriptCommand, WebDriverJSResult, WebDriverJSValue, WebDriverLoadStatus, WebDriverScriptCommand,
}; };
use euclid::{Rect, Size2D}; use euclid::{Rect, Size2D};
@ -1619,7 +1619,10 @@ impl Handler {
InputSourceState::Pointer(PointerInputState::new(&PointerType::Mouse)), InputSourceState::Pointer(PointerInputState::new(&PointerType::Mouse)),
); );
// Steps 8.3 - 8.6 // Step 8.7. Construct a pointer move action.
// Step 8.8. Set a property x to 0 on pointer move action.
// Step 8.9. Set a property y to 0 on pointer move action.
// Step 8.10. Set a property origin to element on pointer move action.
let pointer_move_action = PointerMoveAction { let pointer_move_action = PointerMoveAction {
duration: None, duration: None,
origin: PointerOrigin::Element(WebElement(element_id)), origin: PointerOrigin::Element(WebElement(element_id)),
@ -1628,32 +1631,32 @@ impl Handler {
..Default::default() ..Default::default()
}; };
// Steps 8.7 - 8.8 // Step 8.11. Construct pointer down action.
// Step 8.12. Set a property button to 0 on pointer down action.
let pointer_down_action = PointerDownAction { let pointer_down_action = PointerDownAction {
button: 1, button: i16::from(MouseButton::Left) as u64,
..Default::default() ..Default::default()
}; };
// Steps 8.9 - 8.10 // Step 8.13. Construct pointer up action.
// Step 8.14. Set a property button to 0 on pointer up action.
let pointer_up_action = PointerUpAction { let pointer_up_action = PointerUpAction {
button: 1, button: i16::from(MouseButton::Left) as u64,
..Default::default() ..Default::default()
}; };
// Step 8.11 // Step 8.16 Dispatch a list of actions with input state,
// actions, session's current browsing context, and actions options.
if let Err(error) = if let Err(error) =
self.dispatch_pointermove_action(&id, &pointer_move_action, 0) self.dispatch_pointermove_action(&id, &pointer_move_action, 0)
{ {
return Err(WebDriverError::new(error, "")); return Err(WebDriverError::new(error, ""));
} }
// Steps 8.12
self.dispatch_pointerdown_action(&id, &pointer_down_action); self.dispatch_pointerdown_action(&id, &pointer_down_action);
// Steps 8.13
self.dispatch_pointerup_action(&id, &pointer_up_action); self.dispatch_pointerup_action(&id, &pointer_up_action);
// Step 8.14 // Step 8.17 Remove an input source with input state and input id.
self.session_mut()?.input_state_table.remove(&id); self.session_mut()?.input_state_table.remove(&id);
// Step 13 // Step 13