Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-03 01:59:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

webdriver: Clean-up actions.rs (#39632)

Browse source 
Some clean-up before picking up #37046 again.
- Remove some dead code clippy macro
- Rename `dispatch_general_action` to `dispatch_pause_action`

Testing: No behaviour change.

---------

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye 2025-10-02 18:22:01 +08:00 • committed by GitHub
parent 680a780552
commit 739855ad94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
components/webdriver_server/actions.rs
View file

@ -51,16 +51,14 @@ pub(crate) type ActionsByTick = Vec<TickActions>;
/// <https://w3c.github.io/webdriver/#dfn-input-source-state> /// <https://w3c.github.io/webdriver/#dfn-input-source-state>
pub(crate) enum InputSourceState { pub(crate) enum InputSourceState {
Null, Null,
#[allow(dead_code)]
Key(KeyInputState), Key(KeyInputState),
Pointer(PointerInputState), Pointer(PointerInputState),
#[allow(dead_code)]
Wheel, Wheel,
} }
// https://w3c.github.io/webdriver/#dfn-pointer-input-source /// <https://w3c.github.io/webdriver/#dfn-pointer-input-source>
// TODO: subtype is used for https://w3c.github.io/webdriver/#dfn-get-a-pointer-id /// TODO: subtype is used for <https://w3c.github.io/webdriver/#dfn-get-a-pointer-id>
// Need to add pointer-id to the following struct /// Need to add pointer-id to the following struct
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) struct PointerInputState { pub(crate) struct PointerInputState {
subtype: PointerType, subtype: PointerType,
@ -167,9 +165,9 @@ impl Handler {
// generated by the last invocation of the dispatch tick actions steps. // generated by the last invocation of the dispatch tick actions steps.
self.wait_for_user_agent_handling_complete()?; self.wait_for_user_agent_handling_complete()?;
// At least tick duration milliseconds have passed. // At least tick duration milliseconds have passed.
let elapsed = now.elapsed(); let elapsed = now.elapsed().as_millis() as u64;
if elapsed.as_millis() < tick_duration as u128 { if elapsed < tick_duration {
let sleep_duration = tick_duration - elapsed.as_millis() as u64; let sleep_duration = tick_duration - elapsed;
thread::sleep(Duration::from_millis(sleep_duration)); thread::sleep(Duration::from_millis(sleep_duration));
} }
} }
@ -224,11 +222,8 @@ impl Handler {
// Step 6. Let subtype be action object's subtype. // Step 6. Let subtype be action object's subtype.
// Steps 7, 8. Try to run specific algorithm based on the action type. // Steps 7, 8. Try to run specific algorithm based on the action type.
match action { match action {
ActionItem::Null(NullActionItem::General(_)) => { ActionItem::Null(_) | ActionItem::Key(KeyActionItem::General(_)) => {
self.dispatch_general_action(input_id); self.dispatch_pause_action(input_id);
},
ActionItem::Key(KeyActionItem::General(_)) => {
self.dispatch_general_action(input_id);
}, },
ActionItem::Key(KeyActionItem::Key(KeyAction::Down(keydown_action))) => { ActionItem::Key(KeyActionItem::Key(KeyAction::Down(keydown_action))) => {
self.dispatch_keydown_action(input_id, keydown_action); self.dispatch_keydown_action(input_id, keydown_action);
@ -246,7 +241,7 @@ impl Handler {
self.dispatch_keyup_action(input_id, keyup_action); self.dispatch_keyup_action(input_id, keyup_action);
}, },
ActionItem::Pointer(PointerActionItem::General(_)) => { ActionItem::Pointer(PointerActionItem::General(_)) => {
self.dispatch_general_action(input_id); self.dispatch_pause_action(input_id);
}, },
ActionItem::Pointer(PointerActionItem::Pointer(PointerAction::Down( ActionItem::Pointer(PointerActionItem::Pointer(PointerAction::Down(
pointer_down_action, pointer_down_action,
@ -276,7 +271,7 @@ impl Handler {
self.dispatch_pointerup_action(input_id, pointer_up_action); self.dispatch_pointerup_action(input_id, pointer_up_action);
}, },
ActionItem::Wheel(WheelActionItem::General(_)) => { ActionItem::Wheel(WheelActionItem::General(_)) => {
self.dispatch_general_action(input_id); self.dispatch_pause_action(input_id);
}, },
ActionItem::Wheel(WheelActionItem::Wheel(WheelAction::Scroll(scroll_action))) => { ActionItem::Wheel(WheelActionItem::Wheel(WheelAction::Scroll(scroll_action))) => {
self.dispatch_scroll_action(input_id, scroll_action, tick_duration)?; self.dispatch_scroll_action(input_id, scroll_action, tick_duration)?;
@ -289,7 +284,7 @@ impl Handler {
} }
/// <https://w3c.github.io/webdriver/#dfn-dispatch-a-pause-action> /// <https://w3c.github.io/webdriver/#dfn-dispatch-a-pause-action>
fn dispatch_general_action(&self, source_id: &str) { fn dispatch_pause_action(&self, source_id: &str) {
self.session() self.session()
.unwrap() .unwrap()
.input_state_table_mut() .input_state_table_mut()