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

script: Support keyCode, charCode in KeyboardEvent constructor (#39590)

Browse source 
Support `keyCode` and `charCode` fields in KeyboardEventInit for
Speedometer 3.0

Speedometer 3.0 fails because Servo's KeyboardEvent constructor ignores 
keyCode and charCode parameters, hardcoding them to 0. This breaks
frameworks
that check `event.keyCode === 13` for Enter key detection.  This is how
[Speedometer 3.0 dispatches key
events](8d67f28d02/resources/benchmark-runner.mjs (L166))
vs [Speedometer 2.0
triggerEnter](491acc2d64/resources/tests.mjs (L60)).

Speedometer 3.0 uses the modern KeyboardEvent constructor but passes 
[legacy fields like keyCode and
charCode](https://w3c.github.io/uievents/#legacy-dictionary-KeyboardEventInit)
in the init dictionary for backwards
compatibility with older frameworks(for example: backbone.js)

This change uncomments the legacy KeyboardEventInit fields and updates 
the constructor to read them from the init dictionary instead of 
hardcoding to 0.

Testing: No new tests added. 
Fixes: part of https://github.com/servo/servo/issues/16719

Servo running Speedometer3.0 successfully
<img width="1136" height="880" alt="speedometer 3 0"
src="https://github.com/user-attachments/assets/cf5199a5-d88d-4495-ae96-05fa6332b97e"
/>

---------

Signed-off-by: atbrakhi <atbrakhi@igalia.com>
This commit is contained in:
atbrakhi 2025-10-01 16:45:33 +02:00 • committed by GitHub
parent e49fcdeffd
commit 4ea363277e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/keyboardevent.rs
View file

@ -186,8 +186,8 @@ impl KeyboardEventMethods<crate::DomTypeHolder> for KeyboardEvent {
init.repeat, init.repeat,
init.isComposing, init.isComposing,
modifiers, modifiers,
0, init.charCode,
0, init.keyCode,
can_gc, can_gc,
); );
*event.key.borrow_mut() = init.key.clone(); *event.key.borrow_mut() = init.key.clone();

4
components/script_bindings/webidls/KeyboardEvent.webidl
View file

@ -53,8 +53,8 @@ dictionary KeyboardEventInit : EventModifierInit {
}; };
// https://w3c.github.io/uievents/#legacy-dictionary-KeyboardEventInit // https://w3c.github.io/uievents/#legacy-dictionary-KeyboardEventInit
/*partial dictionary KeyboardEventInit { partial dictionary KeyboardEventInit {
unsigned long charCode = 0; unsigned long charCode = 0;
unsigned long keyCode = 0; unsigned long keyCode = 0;
unsigned long which = 0; unsigned long which = 0;
};*/ };

7
tests/wpt/meta/MANIFEST.json vendored
View file

@ -841982,6 +841982,13 @@
] ]
}, },
"keyboard": { "keyboard": {
"keyboardevent-legacy.html": [
"df1a80893c5c24cd42321c717add74ea87b64a33",
[
null,
{}
]
],
"modifier-keys-combinations.html": [ "modifier-keys-combinations.html": [
"1b364ff72ce539b31ef86f4a1bcf75aed6868845", "1b364ff72ce539b31ef86f4a1bcf75aed6868845",
[ [

29
tests/wpt/tests/uievents/keyboard/keyboardevent-legacy.html vendored Normal file
View file

@ -0,0 +1,29 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title>KeyboardEvent legacy fields initialization Test: KeyCode and charCode</title>
<link rel="author" title="Rakhi Sharma" href="mailto:atbrakhi@igalia.com">
<link rel="help" href="https://w3c.github.io/uievents/#legacy-dictionary-KeyboardEventInit">
<link rel="help" href="https://w3c.github.io/uievents/#idl-keyboardeventinit">
<meta name="assert" content="KeyboardEvent constructor should initialize legacy keyCode and charCode attributes.">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<div id="log"></div>
<script>
var t = async_test("KeyboardEvent constructor should initialize legacy keyCode and charCode");
t.step(function() {
const evPress = new KeyboardEvent("keypress", { keyCode: 65, charCode: 65 });
assert_equals(evPress.keyCode, 65, "keypress: initialized keyCode");
assert_equals(evPress.charCode, 65, "keypress: initialized charCode");
});
t.step(function() {
const evDown = new KeyboardEvent("keydown", { keyCode: 13, charCode: 0 });
assert_equals(evDown.keyCode, 13, "keydown: initialized keyCode");
assert_equals(evDown.charCode, 0, "keydown: initialized charCode should be 0");
});
t.done();
</script>