Changeset 268858 in webkit

Timestamp:

Oct 22, 2020, 2:42:22 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

WebDriver: handle key events with non-ASCII unicode code point
​https://bugs.webkit.org/show_bug.cgi?id=217950

Reviewed by Carlos Alberto Lopez Perez.

Source/WebKit:

We are assuming that key events are limited to ASCII, but they contain a unicode code point.

Fixes: imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\xe0-]

imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\u0416-]
imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\u2603-]
imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\uf6c2-]

• UIProcess/Automation/SimulatedInputDispatcher.h: Use UChar32 instead of char for CharKey.
• UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:

(WebKit::WebAutomationSession::platformSimulateKeyboardInteraction): Handle Charkey as a unicode code point.

• UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp:

(WebKit::WebAutomationSession::platformSimulateKeyboardInteraction): Ditto.

WebDriverTests:

Remove expectations for tests that are now passing.

• TestExpectations.json:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.h (modified) (1 diff)
• Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp (modified) (1 diff)
• WebDriverTests/ChangeLog (modified) (1 diff)
• WebDriverTests/TestExpectations.json (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: handle key events with non-ASCII unicode code point
+        https://bugs.webkit.org/show_bug.cgi?id=217950
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        We are assuming that key events are limited to ASCII, but they contain a unicode code point.
+
+        Fixes: imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\xe0-]
+               imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\u0416-]
+               imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\u2603-]
+               imported/w3c/webdriver/tests/perform_actions/key_events.py::test_printable_key_sends_correct_events[\uf6c2-]
+
+        * UIProcess/Automation/SimulatedInputDispatcher.h: Use UChar32 instead of char for CharKey.
+        * UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:
+        (WebKit::WebAutomationSession::platformSimulateKeyboardInteraction): Handle Charkey as a unicode code point.
+        * UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp:
+        (WebKit::WebAutomationSession::platformSimulateKeyboardInteraction): Ditto.
+
 2020-10-21  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.h

@@ -59 +59 @@
 using VirtualKey = Inspector::Protocol::Automation::VirtualKey;
 using VirtualKeyMap = HashMap<VirtualKey, VirtualKey, WTF::IntHash<VirtualKey>, WTF::StrongEnumHashTraits<VirtualKey>>;
-using CharKey = char; // For WebDriver, this only needs to support ASCII characters on 102-key keyboard.
+using CharKey = UChar32;
 using MouseButton = Inspector::Protocol::Automation::MouseButton;
 using MouseInteraction = Inspector::Protocol::Automation::MouseInteraction;

trunk/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp

@@ -294 +294 @@
         },
         [&] (CharKey charKey) {
-            keyCode = gdk_unicode_to_keyval(g_utf8_get_char(&charKey));
+            keyCode = gdk_unicode_to_keyval(charKey);
         }
     );

trunk/Source/WebKit/UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp

@@ -334 +334 @@
         },
         [&] (CharKey charKey) {
-            keyCode = wpe_unicode_to_key_code(g_utf8_get_char(&charKey));
+            keyCode = wpe_unicode_to_key_code(charKey);
         }
     );

trunk/WebDriverTests/ChangeLog

@@ +1 @@
+2020-10-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: handle key events with non-ASCII unicode code point
+        https://bugs.webkit.org/show_bug.cgi?id=217950
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Remove expectations for tests that are now passing.
+
+        * TestExpectations.json:
+
 2020-10-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/WebDriverTests/TestExpectations.json

@@ -363 +363 @@
                 "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
             },
-            "test_printable_key_sends_correct_events[\\xe0-]": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
-            },
-            "test_printable_key_sends_correct_events[\\u0416-]": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
-            },
-            "test_printable_key_sends_correct_events[\\u2603-]": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
-            },
-            "test_printable_key_sends_correct_events[\\uf6c2-]": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
-            },
             "test_special_key_sends_keydown[META-expected30]": {
                 "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}