Changeset 269421 in webkit

Timestamp:

Nov 5, 2020 12:47:42 AM (21 months ago)

Author:

Carlos Garcia Campos

Message:

WebDriver: handle surrogate pairs in keyboard actions
​https://bugs.webkit.org/show_bug.cgi?id=218279

Reviewed by Brian Burg.

Source/WebKit:

And fail with invalid argument if the string can be represented as a single code point.

Fixes: imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_codepoint_keys_behave_correctly[\U0001f604]

imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_codepoint_keys_behave_correctly[\U0001f60d]
imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[fa]
imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[\u0ba8\u0bbfb]
imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[\u0ba8\u0bbf\u0ba8]
imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[\u1100\u1161\u11a8c]

• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::pressedCharKey):
(WebKit::WebAutomationSession::performInteractionSequence):

WebDriverTests:

Remove expectations for tests that are now passing.

• TestExpectations.json:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp (modified) (2 diffs)
• WebDriverTests/ChangeLog (modified) (1 diff)
• WebDriverTests/TestExpectations.json (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: handle surrogate pairs in keyboard actions
+        https://bugs.webkit.org/show_bug.cgi?id=218279
+
+        Reviewed by Brian Burg.
+
+        And fail with invalid argument if the string can be represented as a single code point.
+
+        Fixes: imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_codepoint_keys_behave_correctly[\U0001f604]
+               imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_codepoint_keys_behave_correctly[\U0001f60d]
+               imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[fa]
+               imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[\u0ba8\u0bbfb]
+               imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[\u0ba8\u0bbf\u0ba8]
+               imported/w3c/webdriver/tests/perform_actions/key_special_keys.py::test_invalid_multiple_codepoint_keys_fail[\u1100\u1161\u11a8c]
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::pressedCharKey):
+        (WebKit::WebAutomationSession::performInteractionSequence):
+
 2020-11-05  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp

@@ -1945 +1945 @@
     }
 }
+
+static Optional<UChar32> pressedCharKey(const String& pressedCharKeyString)
+{
+    switch (pressedCharKeyString.length()) {
+    case 1:
+        return pressedCharKeyString.characterAt(0);
+    case 2: {
+        auto lead = pressedCharKeyString.characterAt(0);
+        auto trail = pressedCharKeyString.characterAt(1);
+        if (U16_IS_LEAD(lead) && U16_IS_TRAIL(trail))
+            return U16_GET_SUPPLEMENTARY(lead, trail);
+    }
+    }
+
+    return WTF::nullopt;
+}
 #endif // ENABLE(WEBDRIVER_ACTIONS_API)
 
@@ -2056 +2072 @@
 
             auto pressedCharKeyString = stateObject->getString("pressedCharKey"_s);
-            if (!!pressedCharKeyString)
-                sourceState.pressedCharKeys.add(pressedCharKeyString.characterAt(0));
+            if (!!pressedCharKeyString) {
+                auto charKey = pressedCharKey(pressedCharKeyString);
+                if (!charKey)
+                    ASYNC_FAIL_WITH_PREDEFINED_ERROR_AND_DETAILS(InvalidParameter, "Invalid 'pressedCharKey'.");
+                sourceState.pressedCharKeys.add(*charKey);
+            }
 
             if (auto pressedVirtualKeysArray = stateObject->getArray("pressedVirtualKeys"_s)) {

trunk/WebDriverTests/ChangeLog

@@ +1 @@
+2020-11-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: handle surrogate pairs in keyboard actions
+        https://bugs.webkit.org/show_bug.cgi?id=218279
+
+        Reviewed by Brian Burg.
+
+        Remove expectations for tests that are now passing.
+
+        * TestExpectations.json:
+
 2020-11-03  Lauro Moura  <lmoura@igalia.com>
 

trunk/WebDriverTests/TestExpectations.json

@@ -448 +448 @@
     },
     "imported/w3c/webdriver/tests/perform_actions/key_special_keys.py": {
-        "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
+        "subtests": {
+            "test_codepoint_keys_behave_correctly[\\u0ba8\\u0bbf]": {
+                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
+            },
+            "test_codepoint_keys_behave_correctly[\\u1100\\u1161\\u11a8]": {
+                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/184967"}}
+            }
+        }
     },