Changeset 254424 in webkit

Timestamp:

Jan 13, 2020 1:31:24 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

WebDriver: pressed virtual keys not correctly handled in action sequences
​https://bugs.webkit.org/show_bug.cgi?id=205997

Reviewed by Brian Burg.

Source/WebDriver:

We are assuming that only one virtual key can be pressed and that a key up always releases the pressed virtual
key if any. We should keep a list of pressed keys and remove them from the list when key up happens for them.

Fixes: imported/w3c/webdriver/tests/perform_actions/key_modifiers.py::test_shift_modifier_generates_capital_letters[\ue008]

imported/w3c/webdriver/tests/perform_actions/key_modifiers.py::test_shift_modifier_generates_capital_letters[\ue050]

• Session.cpp:

(WebDriver::Session::performActions):

• Session.h:

Source/WebKit:

When modifiers are present we need to translate the keys that might be affected by the modifiers.

• UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:

(WebKit::doKeyStrokeEvent):

Location:

trunk/Source

Files:

• WebDriver/ChangeLog (modified) (1 diff)
• WebDriver/Session.cpp (modified) (2 diffs)
• WebDriver/Session.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp (modified) (1 diff)

trunk/Source/WebDriver/ChangeLog

@@ +1 @@
+2020-01-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: pressed virtual keys not correctly handled in action sequences
+        https://bugs.webkit.org/show_bug.cgi?id=205997
+
+        Reviewed by Brian Burg.
+
+        We are assuming that only one virtual key can be pressed and that a key up always releases the pressed virtual
+        key if any. We should keep a list of pressed keys and remove them from the list when key up happens for them.
+
+        Fixes: imported/w3c/webdriver/tests/perform_actions/key_modifiers.py::test_shift_modifier_generates_capital_letters[\ue008]
+               imported/w3c/webdriver/tests/perform_actions/key_modifiers.py::test_shift_modifier_generates_capital_letters[\ue050]
+
+        * Session.cpp:
+        (WebDriver::Session::performActions):
+        * Session.h:
+
 2020-01-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebDriver/Session.cpp

@@ -2577 +2577 @@
                 case Action::Type::Key:
                     switch (action.subtype) {
-                    case Action::Subtype::KeyUp:
-                        if (currentState.pressedVirtualKey)
-                            currentState.pressedVirtualKey = WTF::nullopt;
+                    case Action::Subtype::KeyUp: {
+                        KeyModifier modifier;
+                        auto virtualKey = virtualKeyForKey(action.key.value()[0], modifier);
+                        if (!virtualKey.isNull())
+                            currentState.pressedVirtualKeys.remove(virtualKey);
                         else
                             currentState.pressedKey = WTF::nullopt;
                         break;
+                    }
                     case Action::Subtype::KeyDown: {
                         KeyModifier modifier;
                         auto virtualKey = virtualKeyForKey(action.key.value()[0], modifier);
                         if (!virtualKey.isNull())
-                            currentState.pressedVirtualKey = virtualKey;
+                            currentState.pressedVirtualKeys.add(virtualKey);
                         else
                             currentState.pressedKey = action.key.value();
@@ -2604 +2607 @@
                     if (currentState.pressedKey)
                         state->setString("pressedCharKey"_s, currentState.pressedKey.value());
-                    if (currentState.pressedVirtualKey) {
+                    if (!currentState.pressedVirtualKeys.isEmpty()) {
                         // FIXME: support parsing and tracking multiple virtual keys.
                         Ref<JSON::Array> virtualKeys = JSON::Array::create();
-                        virtualKeys->pushString(currentState.pressedVirtualKey.value());
+                        for (const auto& virtualKey : currentState.pressedVirtualKeys)
+                            virtualKeys->pushString(virtualKey);
                         state->setArray("pressedVirtualKeys"_s, WTFMove(virtualKeys));
                     }

trunk/Source/WebDriver/Session.h

@@ -30 +30 @@
 #include <wtf/Forward.h>
 #include <wtf/Function.h>
+#include <wtf/HashSet.h>
 #include <wtf/JSONValues.h>
 #include <wtf/OptionSet.h>
@@ -203 +204 @@
         Optional<MouseButton> pressedButton;
         Optional<String> pressedKey;
-        Optional<String> pressedVirtualKey;
+        HashSet<String> pressedVirtualKeys;
     };
     InputSourceState& inputSourceState(const String& id);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: pressed virtual keys not correctly handled in action sequences
+        https://bugs.webkit.org/show_bug.cgi?id=205997
+
+        Reviewed by Brian Burg.
+
+        When modifiers are present we need to translate the keys that might be affected by the modifiers.
+
+        * UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp:
+        (WebKit::doKeyStrokeEvent):
+
 2020-01-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -155 +155 @@
     if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keyVal, &keys.outPtr(), &keysCount) && keysCount)
         event->key.hardware_keycode = keys.get()[0].keycode;
+
+    if (state) {
+        gdk_keymap_translate_keyboard_state(gdk_keymap_get_default(), event->key.hardware_keycode, static_cast<GdkModifierType>(state),
+            0, &event->key.keyval, nullptr, nullptr, nullptr);
+    }
 
     gtk_main_do_event(event.get());