Changeset 236271 in webkit

Timestamp:

Sep 20, 2018 11:20:02 AM (6 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Support testing more hardware special keys
​https://bugs.webkit.org/show_bug.cgi?id=189793

Reviewed by Simon Fraser.

Tools:

• TestRunnerShared/spi/IOKitSPI.h: Add more SPI constants.
• WebKitTestRunner/ios/HIDEventGenerator.mm:

(keyCodeForDOMFunctionKey): Extracted out logic from hidUsageCodeForCharacter() to return the
key code for the F1, F2, ..., F12 keys and extended the code to compute the key code for the
F13, F14, ..., F24 keys.
(hidUsageCodeForCharacter): Modified to call keyCodeForDOMFunctionKey().

LayoutTests:

For now, many of the DOM keydown and keyup events for special hardware keys are wrong.
We will fix this up in a subsequent commit(s).

• fast/events/ios/keydown-keyup-special-keys-in-non-editable-element-expected.txt: Added.
• fast/events/ios/keydown-keyup-special-keys-in-non-editable-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/ios/keydown-keyup-special-keys-in-non-editable-element-expected.txt (added)
• LayoutTests/fast/events/ios/keydown-keyup-special-keys-in-non-editable-element.html (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestRunnerShared/spi/IOKitSPI.h (modified) (1 diff)
• Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-20  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Support testing more hardware special keys
+        https://bugs.webkit.org/show_bug.cgi?id=189793
+
+        Reviewed by Simon Fraser.
+
+        For now, many of the DOM keydown and keyup events for special hardware keys are wrong.
+        We will fix this up in a subsequent commit(s).
+
+        * fast/events/ios/keydown-keyup-special-keys-in-non-editable-element-expected.txt: Added.
+        * fast/events/ios/keydown-keyup-special-keys-in-non-editable-element.html: Added.
+
 2018-09-20  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-09-20  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Support testing more hardware special keys
+        https://bugs.webkit.org/show_bug.cgi?id=189793
+
+        Reviewed by Simon Fraser.
+
+        * TestRunnerShared/spi/IOKitSPI.h: Add more SPI constants.
+        * WebKitTestRunner/ios/HIDEventGenerator.mm:
+        (keyCodeForDOMFunctionKey): Extracted out logic from hidUsageCodeForCharacter() to return the
+        key code for the F1, F2, ..., F12 keys and extended the code to compute the key code for the
+        F13, F14, ..., F24 keys.
+        (hidUsageCodeForCharacter): Modified to call keyCodeForDOMFunctionKey().
+
 2018-09-20  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Tools/TestRunnerShared/spi/IOKitSPI.h

@@ -187 +187 @@
     kHIDUsage_KeyboardSlash = 0x38,
     kHIDUsage_KeyboardF1 = 0x3A,
+    kHIDUsage_KeyboardPrintScreen = 0x46,
+    kHIDUsage_KeyboardInsert = 0x49,
     kHIDUsage_KeyboardHome = 0x4A,
     kHIDUsage_KeyboardPageUp = 0x4B,
+    kHIDUsage_KeyboardDeleteForward = 0x4C,
     kHIDUsage_KeyboardEnd = 0x4D,
+    kHIDUsage_KeyboardPageDown = 0x4E,
     kHIDUsage_KeyboardRightArrow = 0x4F,
     kHIDUsage_KeyboardLeftArrow = 0x50,
     kHIDUsage_KeyboardDownArrow = 0x51,
     kHIDUsage_KeyboardUpArrow = 0x52,
+    kHIDUsage_KeyboardF13 = 0x68,
+    kHIDUsage_KeyboardMenu = 0x76,
     kHIDUsage_KeyboardLeftControl = 0xE0,
     kHIDUsage_KeyboardLeftShift = 0xE1,
-    kHIDUsage_KeyboardLeftAlt = 0xE2
+    kHIDUsage_KeyboardLeftAlt = 0xE2,
+    kHIDUsage_KeyboardLeftGUI = 0xE3,
+    kHIDUsage_KeyboardRightControl = 0xE4,
+    kHIDUsage_KeyboardRightShift = 0xE5,
+    kHIDUsage_KeyboardRightAlt = 0xE6,
+    kHIDUsage_KeyboardRightGUI = 0xE7,
 };
 

trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm

@@ -33 +33 @@
 #import <wtf/Assertions.h>
 #import <wtf/BlockPtr.h>
+#import <wtf/Optional.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/SoftLinking.h>
@@ -824 +825 @@
     }
     return false;
+}
+
+static std::optional<uint32_t> keyCodeForDOMFunctionKey(NSString *key)
+{
+    // Compare the input string with the function-key names defined by the DOM spec (i.e. "F1",...,"F24").
+    // If the input string is a function-key name, set its key code. On iOS the key codes for the first 12
+    // function keys are disjoint from the key codes of the last 12 function keys.
+    for (int i = 1; i <= 12; ++i) {
+        if ([key isEqualToString:[NSString stringWithFormat:@"F%d", i]])
+            return kHIDUsage_KeyboardF1 + i - 1;
+    }
+    for (int i = 13; i <= 24; ++i) {
+        if ([key isEqualToString:[NSString stringWithFormat:@"F%d", i]])
+            return kHIDUsage_KeyboardF13 + i - 1;
+    }
+    return std::nullopt;
 }
 
@@ -908 +925 @@
         }
     }
-    const int functionKeyOffset = kHIDUsage_KeyboardF1;
-    for (int functionKeyIndex = 1; functionKeyIndex <= 12; ++functionKeyIndex) {
-        if ([key isEqualToString:[NSString stringWithFormat:@"F%d", functionKeyIndex]])
-            return functionKeyOffset + functionKeyIndex - 1;
-    }
+
+    if (auto keyCode = keyCodeForDOMFunctionKey(key))
+        return *keyCode;
+
+    if ([key isEqualToString:@"pageUp"])
+        return kHIDUsage_KeyboardPageUp;
+    if ([key isEqualToString:@"pageDown"])
+        return kHIDUsage_KeyboardPageDown;
+    if ([key isEqualToString:@"home"])
+        return kHIDUsage_KeyboardHome;
+    if ([key isEqualToString:@"insert"])
+        return kHIDUsage_KeyboardInsert;
+    if ([key isEqualToString:@"end"])
+        return kHIDUsage_KeyboardEnd;
     if ([key isEqualToString:@"escape"])
         return kHIDUsage_KeyboardEscape;
@@ -927 +953 @@
     if ([key isEqualToString:@"delete"])
         return kHIDUsage_KeyboardDeleteOrBackspace;
+    if ([key isEqualToString:@"leftCommand"])
+        return kHIDUsage_KeyboardLeftGUI;
+    if ([key isEqualToString:@"rightCommand"])
+        return kHIDUsage_KeyboardRightGUI;
     // The simulator keyboard interprets both left and right modifier keys using the left version of the usage code.
     if ([key isEqualToString:@"leftControl"] || [key isEqualToString:@"rightControl"])