Attachment 346463 Details for Bug 188093 – Patch

[patch] Patch

wpe-key-syms.diff (text/plain), 57.58 KB, created by Carlos Garcia Campos on 2018-08-03 01:48:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2018-08-03 01:48:55 PDT

Size: 57.58 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index aa50efae05a..3947a418f27 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-08-03  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [WPE] Use WPE key symbols and new API instead of xkbcommon and the key mapper
>+        https://bugs.webkit.org/show_bug.cgi?id=188093
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add helper functions to get key code, hardware key code, key identifier and windows key code from a WPE key symbol.
>+
>+        * platform/PlatformKeyboardEvent.h:
>+        * platform/wpe/PlatformKeyboardEventWPE.cpp:
>+        (WebCore::PlatformKeyboardEvent::keyValueForWPEKeyCode):
>+        (WebCore::PlatformKeyboardEvent::keyCodeForHardwareKeyCode):
>+        (WebCore::PlatformKeyboardEvent::keyIdentifierForWPEKeyCode):
>+        (WebCore::PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode):
>+        (WebCore::PlatformKeyboardEvent::singleCharacterString):
>+
> 2018-08-02  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Apply the "10.6.6 Complicated cases" when computing height and margin for the document renderer
>diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h
>index 97d03af92ad..8cde5b9be10 100644
>--- a/Source/WebCore/platform/PlatformKeyboardEvent.h
>+++ b/Source/WebCore/platform/PlatformKeyboardEvent.h
>@@ -164,6 +164,14 @@ namespace WebCore {
>         static bool modifiersContainCapsLock(unsigned);
> #endif
> 
>+#if PLATFORM(WPE)
>+        static String keyValueForWPEKeyCode(unsigned);
>+        static String keyCodeForHardwareKeyCode(unsigned);
>+        static String keyIdentifierForWPEKeyCode(unsigned);
>+        static int windowsKeyCodeForWPEKeyCode(unsigned);
>+        static String singleCharacterString(unsigned);
>+#endif
>+
>     protected:
>         String m_text;
>         String m_unmodifiedText;
>diff --git a/Source/WebCore/platform/wpe/PlatformKeyboardEventWPE.cpp b/Source/WebCore/platform/wpe/PlatformKeyboardEventWPE.cpp
>index fa4f38e11f0..ec20f6fb968 100644
>--- a/Source/WebCore/platform/wpe/PlatformKeyboardEventWPE.cpp
>+++ b/Source/WebCore/platform/wpe/PlatformKeyboardEventWPE.cpp
>@@ -26,10 +26,1208 @@
> #include "config.h"
> #include "PlatformKeyboardEvent.h"
> 
>-#include "NotImplemented.h"
>+#include "WindowsKeyboardCodes.h"
>+#include <wpe/wpe.h>
>+#include <wtf/glib/GUniquePtr.h>
> 
> namespace WebCore {
> 
>+// FIXME: This is incomplete. We should change this to mirror
>+// more like what Firefox does, and generate these switch statements
>+// at build time.
>+// https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values
>+String PlatformKeyboardEvent::keyValueForWPEKeyCode(unsigned keyCode)
>+{
>+    switch (keyCode) {
>+    // Modifier keys.
>+    case WPE_KEY_Alt_L:
>+    case WPE_KEY_Alt_R:
>+        return "Alt"_s;
>+    // Firefox uses WPE_KEY_Mode_switch for AltGraph as well.
>+    case WPE_KEY_ISO_Level3_Shift:
>+    case WPE_KEY_ISO_Level3_Latch:
>+    case WPE_KEY_ISO_Level3_Lock:
>+    case WPE_KEY_ISO_Level5_Shift:
>+    case WPE_KEY_ISO_Level5_Latch:
>+    case WPE_KEY_ISO_Level5_Lock:
>+        return "AltGraph"_s;
>+    case WPE_KEY_Caps_Lock:
>+        return "CapsLock"_s;
>+    case WPE_KEY_Control_L:
>+    case WPE_KEY_Control_R:
>+        return "Control"_s;
>+    // Fn: This is typically a hardware key that does not generate a separate code.
>+    // FnLock.
>+    case WPE_KEY_Hyper_L:
>+    case WPE_KEY_Hyper_R:
>+        return "Hyper"_s;
>+    case WPE_KEY_Meta_L:
>+    case WPE_KEY_Meta_R:
>+        return "Meta"_s;
>+    case WPE_KEY_Num_Lock:
>+        return "NumLock"_s;
>+    case WPE_KEY_Scroll_Lock:
>+        return "ScrollLock"_s;
>+    case WPE_KEY_Shift_L:
>+    case WPE_KEY_Shift_R:
>+        return "Shift"_s;
>+    case WPE_KEY_Super_L:
>+    case WPE_KEY_Super_R:
>+        return "Super"_s;
>+    // Symbol.
>+    // SymbolLock.
>+
>+    // Whitespace keys.
>+    case WPE_KEY_Return:
>+    case WPE_KEY_KP_Enter:
>+    case WPE_KEY_ISO_Enter:
>+    case WPE_KEY_3270_Enter:
>+        return "Enter"_s;
>+    case WPE_KEY_Tab:
>+    case WPE_KEY_KP_Tab:
>+        return "Tab"_s;
>+
>+    // Navigation keys.
>+    case WPE_KEY_Down:
>+    case WPE_KEY_KP_Down:
>+        return "ArrowDown"_s;
>+    case WPE_KEY_Left:
>+    case WPE_KEY_KP_Left:
>+        return "ArrowLeft"_s;
>+    case WPE_KEY_Right:
>+    case WPE_KEY_KP_Right:
>+        return "ArrowRight"_s;
>+    case WPE_KEY_Up:
>+    case WPE_KEY_KP_Up:
>+        return "ArrowUp"_s;
>+    case WPE_KEY_End:
>+    case WPE_KEY_KP_End:
>+        return "End"_s;
>+    case WPE_KEY_Home:
>+    case WPE_KEY_KP_Home:
>+        return "Home"_s;
>+    case WPE_KEY_Page_Down:
>+    case WPE_KEY_KP_Page_Down:
>+        return "PageDown"_s;
>+    case WPE_KEY_Page_Up:
>+    case WPE_KEY_KP_Page_Up:
>+        return "PageUp"_s;
>+
>+    // Editing keys.
>+    case WPE_KEY_BackSpace:
>+        return "Backspace"_s;
>+    case WPE_KEY_Clear:
>+        return "Clear"_s;
>+    case WPE_KEY_Copy:
>+        return "Copy"_s;
>+    case WPE_KEY_3270_CursorSelect:
>+        return "CrSel"_s;
>+    case WPE_KEY_Cut:
>+        return "Cut"_s;
>+    case WPE_KEY_Delete:
>+    case WPE_KEY_KP_Delete:
>+        return "Delete"_s;
>+    case WPE_KEY_3270_EraseEOF:
>+        return "EraseEof"_s;
>+    case WPE_KEY_3270_ExSelect:
>+        return "ExSel"_s;
>+    case WPE_KEY_Insert:
>+    case WPE_KEY_KP_Insert:
>+        return "Insert"_s;
>+    case WPE_KEY_Paste:
>+        return "Paste"_s;
>+    case WPE_KEY_Redo:
>+        return "Redo"_s;
>+    case WPE_KEY_Undo:
>+        return "Undo"_s;
>+
>+    // UI keys.
>+    // Accept.
>+    // Again.
>+    case WPE_KEY_3270_Attn:
>+        return "Attn"_s;
>+    case WPE_KEY_Cancel:
>+        return "Cancel"_s;
>+    case WPE_KEY_Menu:
>+        return "ContextMenu"_s;
>+    case WPE_KEY_Escape:
>+        return "Escape"_s;
>+    case WPE_KEY_Execute:
>+        return "Execute"_s;
>+    case WPE_KEY_Find:
>+        return "Find"_s;
>+    case WPE_KEY_Help:
>+        return "Help"_s;
>+    case WPE_KEY_Pause:
>+    case WPE_KEY_Break:
>+        return "Pause"_s;
>+    case WPE_KEY_3270_Play:
>+        return "Play"_s;
>+    // Props.
>+    case WPE_KEY_Select:
>+        return "Select"_s;
>+    case WPE_KEY_ZoomIn:
>+        return "ZoomIn"_s;
>+    case WPE_KEY_ZoomOut:
>+        return "ZoomOut"_s;
>+
>+    // Device keys.
>+    case WPE_KEY_MonBrightnessDown:
>+        return "BrightnessDown"_s;
>+    case WPE_KEY_MonBrightnessUp:
>+        return "BrightnessUp"_s;
>+    case WPE_KEY_Eject:
>+        return "Eject"_s;
>+    case WPE_KEY_LogOff:
>+        return "LogOff"_s;
>+    // Power.
>+    case WPE_KEY_PowerDown:
>+    case WPE_KEY_PowerOff:
>+        return "PowerOff"_s;
>+    case WPE_KEY_3270_PrintScreen:
>+    case WPE_KEY_Print:
>+    case WPE_KEY_Sys_Req:
>+        return "PrintScreen"_s;
>+    case WPE_KEY_Hibernate:
>+        return "Hibernate"_s;
>+    case WPE_KEY_Standby:
>+    case WPE_KEY_Suspend:
>+    case WPE_KEY_Sleep:
>+        return "Standby"_s;
>+    case WPE_KEY_WakeUp:
>+        return "WakeUp"_s;
>+
>+    // IME keys.
>+    case WPE_KEY_MultipleCandidate:
>+        return "AllCandidates"_s;
>+    case WPE_KEY_Eisu_Shift:
>+    case WPE_KEY_Eisu_toggle:
>+        return "Alphanumeric"_s;
>+    case WPE_KEY_Codeinput:
>+        return "CodeInput"_s;
>+    case WPE_KEY_Multi_key:
>+        return "Compose"_s;
>+    case WPE_KEY_Henkan:
>+        return "Convert"_s;
>+    case WPE_KEY_dead_grave:
>+    case WPE_KEY_dead_acute:
>+    case WPE_KEY_dead_circumflex:
>+    case WPE_KEY_dead_tilde:
>+    case WPE_KEY_dead_macron:
>+    case WPE_KEY_dead_breve:
>+    case WPE_KEY_dead_abovedot:
>+    case WPE_KEY_dead_diaeresis:
>+    case WPE_KEY_dead_abovering:
>+    case WPE_KEY_dead_doubleacute:
>+    case WPE_KEY_dead_caron:
>+    case WPE_KEY_dead_cedilla:
>+    case WPE_KEY_dead_ogonek:
>+    case WPE_KEY_dead_iota:
>+    case WPE_KEY_dead_voiced_sound:
>+    case WPE_KEY_dead_semivoiced_sound:
>+    case WPE_KEY_dead_belowdot:
>+    case WPE_KEY_dead_hook:
>+    case WPE_KEY_dead_horn:
>+    case WPE_KEY_dead_stroke:
>+    case WPE_KEY_dead_abovecomma:
>+    case WPE_KEY_dead_abovereversedcomma:
>+    case WPE_KEY_dead_doublegrave:
>+    case WPE_KEY_dead_belowring:
>+    case WPE_KEY_dead_belowmacron:
>+    case WPE_KEY_dead_belowcircumflex:
>+    case WPE_KEY_dead_belowtilde:
>+    case WPE_KEY_dead_belowbreve:
>+    case WPE_KEY_dead_belowdiaeresis:
>+    case WPE_KEY_dead_invertedbreve:
>+    case WPE_KEY_dead_belowcomma:
>+    case WPE_KEY_dead_currency:
>+    case WPE_KEY_dead_a:
>+    case WPE_KEY_dead_A:
>+    case WPE_KEY_dead_e:
>+    case WPE_KEY_dead_E:
>+    case WPE_KEY_dead_i:
>+    case WPE_KEY_dead_I:
>+    case WPE_KEY_dead_o:
>+    case WPE_KEY_dead_O:
>+    case WPE_KEY_dead_u:
>+    case WPE_KEY_dead_U:
>+    case WPE_KEY_dead_small_schwa:
>+    case WPE_KEY_dead_capital_schwa:
>+        return "Dead"_s;
>+    // FinalMode
>+    case WPE_KEY_ISO_First_Group:
>+        return "GroupFirst"_s;
>+    case WPE_KEY_ISO_Last_Group:
>+        return "GroupLast"_s;
>+    case WPE_KEY_ISO_Next_Group:
>+        return "GroupNext"_s;
>+    case WPE_KEY_ISO_Prev_Group:
>+        return "GroupPrevious"_s;
>+    case WPE_KEY_Mode_switch:
>+        return "ModeChange"_s;
>+    // NextCandidate.
>+    case WPE_KEY_Muhenkan:
>+        return "NonConvert"_s;
>+    case WPE_KEY_PreviousCandidate:
>+        return "PreviousCandidate"_s;
>+    // Process.
>+    case WPE_KEY_SingleCandidate:
>+        return "SingleCandidate"_s;
>+
>+    // Korean and Japanese keys.
>+    case WPE_KEY_Hangul:
>+        return "HangulMode"_s;
>+    case WPE_KEY_Hangul_Hanja:
>+        return "HanjaMode"_s;
>+    case WPE_KEY_Hangul_Jeonja:
>+        return "JunjaMode"_s;
>+    case WPE_KEY_Hankaku:
>+        return "Hankaku"_s;
>+    case WPE_KEY_Hiragana:
>+        return "Hiragana"_s;
>+    case WPE_KEY_Hiragana_Katakana:
>+        return "HiraganaKatakana"_s;
>+    case WPE_KEY_Kana_Lock:
>+    case WPE_KEY_Kana_Shift:
>+        return "KanaMode"_s;
>+    case WPE_KEY_Kanji:
>+        return "KanjiMode"_s;
>+    case WPE_KEY_Katakana:
>+        return "Katakana"_s;
>+    case WPE_KEY_Romaji:
>+        return "Romaji"_s;
>+    case WPE_KEY_Zenkaku:
>+        return "Zenkaku"_s;
>+    case WPE_KEY_Zenkaku_Hankaku:
>+        return "ZenkakuHanaku"_s;
>+
>+    // Multimedia keys.
>+    // ChannelDown.
>+    // ChannelUp.
>+    case WPE_KEY_Close:
>+        return "Close"_s;
>+    case WPE_KEY_MailForward:
>+        return "MailForward"_s;
>+    case WPE_KEY_Reply:
>+        return "MailReply"_s;
>+    case WPE_KEY_Send:
>+        return "MailSend"_s;
>+    case WPE_KEY_AudioForward:
>+        return "MediaFastForward"_s;
>+    case WPE_KEY_AudioPause:
>+        return "MediaPause"_s;
>+    case WPE_KEY_AudioPlay:
>+        return "MediaPlay"_s;
>+    // MediaPlayPause
>+    case WPE_KEY_AudioRecord:
>+        return "MediaRecord"_s;
>+    case WPE_KEY_AudioRewind:
>+        return "MediaRewind"_s;
>+    case WPE_KEY_AudioStop:
>+        return "MediaStop"_s;
>+    case WPE_KEY_AudioNext:
>+        return "MediaTrackNext"_s;
>+    case WPE_KEY_AudioPrev:
>+        return "MediaTrackPrevious"_s;
>+    case WPE_KEY_New:
>+        return "New"_s;
>+    case WPE_KEY_Open:
>+        return "Open"_s;
>+    // Print.
>+    case WPE_KEY_Save:
>+        return "Save"_s;
>+    case WPE_KEY_Spell:
>+        return "SpellCheck"_s;
>+
>+    // Function keys.
>+    case WPE_KEY_F1:
>+        return "F1"_s;
>+    case WPE_KEY_F2:
>+        return "F2"_s;
>+    case WPE_KEY_F3:
>+        return "F3"_s;
>+    case WPE_KEY_F4:
>+        return "F4"_s;
>+    case WPE_KEY_F5:
>+        return "F5"_s;
>+    case WPE_KEY_F6:
>+        return "F6"_s;
>+    case WPE_KEY_F7:
>+        return "F7"_s;
>+    case WPE_KEY_F8:
>+        return "F8"_s;
>+    case WPE_KEY_F9:
>+        return "F9"_s;
>+    case WPE_KEY_F10:
>+        return "F10"_s;
>+    case WPE_KEY_F11:
>+        return "F11"_s;
>+    case WPE_KEY_F12:
>+        return "F12"_s;
>+    case WPE_KEY_F13:
>+        return "F13"_s;
>+    case WPE_KEY_F14:
>+        return "F14"_s;
>+    case WPE_KEY_F15:
>+        return "F15"_s;
>+    case WPE_KEY_F16:
>+        return "F16"_s;
>+    case WPE_KEY_F17:
>+        return "F17"_s;
>+    case WPE_KEY_F18:
>+        return "F18"_s;
>+    case WPE_KEY_F19:
>+        return "F19"_s;
>+    case WPE_KEY_F20:
>+        return "F20"_s;
>+    default:
>+        break;
>+    }
>+
>+    guint32 unicodeCharacter = wpe_key_code_to_unicode(keyCode);
>+    if (unicodeCharacter) {
>+        // UTF-8 will use up to 6 bytes.
>+        char utf8[7] = { 0 };
>+        g_unichar_to_utf8(unicodeCharacter, utf8);
>+        return String::fromUTF8(utf8);
>+    }
>+
>+    return "Unidentified"_s;
>+}
>+
>+// FIXME: This is incomplete. We should change this to mirror
>+// more like what Firefox does, and generate these switch statements
>+// at build time.
>+// https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code
>+String PlatformKeyboardEvent::keyCodeForHardwareKeyCode(unsigned keyCode)
>+{
>+    switch (keyCode) {
>+    case 0x0009:
>+        return "Escape"_s;
>+    case 0x000A:
>+        return "Digit1"_s;
>+    case 0x000B:
>+        return "Digit2"_s;
>+    case 0x000C:
>+        return "Digit3"_s;
>+    case 0x000D:
>+        return "Digit4"_s;
>+    case 0x000E:
>+        return "Digit5"_s;
>+    case 0x000F:
>+        return "Digit6"_s;
>+    case 0x0010:
>+        return "Digit7"_s;
>+    case 0x0011:
>+        return "Digit8"_s;
>+    case 0x0012:
>+        return "Digit9"_s;
>+    case 0x0013:
>+        return "Digit0"_s;
>+    case 0x0014:
>+        return "Minus"_s;
>+    case 0x0015:
>+        return "Equal"_s;
>+    case 0x0016:
>+        return "Backspace"_s;
>+    case 0x0017:
>+        return "Tab"_s;
>+    case 0x0018:
>+        return "KeyQ"_s;
>+    case 0x0019:
>+        return "KeyW"_s;
>+    case 0x001A:
>+        return "KeyE"_s;
>+    case 0x001B:
>+        return "KeyR"_s;
>+    case 0x001C:
>+        return "KeyT"_s;
>+    case 0x001D:
>+        return "KeyY"_s;
>+    case 0x001E:
>+        return "KeyU"_s;
>+    case 0x001F:
>+        return "KeyI"_s;
>+    case 0x0020:
>+        return "KeyO"_s;
>+    case 0x0021:
>+        return "KeyP"_s;
>+    case 0x0022:
>+        return "BracketLeft"_s;
>+    case 0x0023:
>+        return "BracketRight"_s;
>+    case 0x0024:
>+        return "Enter"_s;
>+    case 0x0025:
>+        return "ControlLeft"_s;
>+    case 0x0026:
>+        return "KeyA"_s;
>+    case 0x0027:
>+        return "KeyS"_s;
>+    case 0x0028:
>+        return "KeyD"_s;
>+    case 0x0029:
>+        return "KeyF"_s;
>+    case 0x002A:
>+        return "KeyG"_s;
>+    case 0x002B:
>+        return "KeyH"_s;
>+    case 0x002C:
>+        return "KeyJ"_s;
>+    case 0x002D:
>+        return "KeyK"_s;
>+    case 0x002E:
>+        return "KeyL"_s;
>+    case 0x002F:
>+        return "Semicolon"_s;
>+    case 0x0030:
>+        return "Quote"_s;
>+    case 0x0031:
>+        return "Backquote"_s;
>+    case 0x0032:
>+        return "ShiftLeft"_s;
>+    case 0x0033:
>+        return "Backslash"_s;
>+    case 0x0034:
>+        return "KeyZ"_s;
>+    case 0x0035:
>+        return "KeyX"_s;
>+    case 0x0036:
>+        return "KeyC"_s;
>+    case 0x0037:
>+        return "KeyV"_s;
>+    case 0x0038:
>+        return "KeyB"_s;
>+    case 0x0039:
>+        return "KeyN"_s;
>+    case 0x003A:
>+        return "KeyM"_s;
>+    case 0x003B:
>+        return "Comma"_s;
>+    case 0x003C:
>+        return "Period"_s;
>+    case 0x003D:
>+        return "Slash"_s;
>+    case 0x003E:
>+        return "ShiftRight"_s;
>+    case 0x003F:
>+        return "NumpadMultiply"_s;
>+    case 0x0040:
>+        return "AltLeft"_s;
>+    case 0x0041:
>+        return "Space"_s;
>+    case 0x0042:
>+        return "CapsLock"_s;
>+    case 0x0043:
>+        return "F1"_s;
>+    case 0x0044:
>+        return "F2"_s;
>+    case 0x0045:
>+        return "F3"_s;
>+    case 0x0046:
>+        return "F4"_s;
>+    case 0x0047:
>+        return "F5"_s;
>+    case 0x0048:
>+        return "F6"_s;
>+    case 0x0049:
>+        return "F7"_s;
>+    case 0x004A:
>+        return "F8"_s;
>+    case 0x004B:
>+        return "F9"_s;
>+    case 0x004C:
>+        return "F10"_s;
>+    case 0x004D:
>+        return "NumLock"_s;
>+    case 0x004E:
>+        return "ScrollLock"_s;
>+    case 0x004F:
>+        return "Numpad7"_s;
>+    case 0x0050:
>+        return "Numpad8"_s;
>+    case 0x0051:
>+        return "Numpad9"_s;
>+    case 0x0052:
>+        return "NumpadSubtract"_s;
>+    case 0x0053:
>+        return "Numpad4"_s;
>+    case 0x0054:
>+        return "Numpad5"_s;
>+    case 0x0055:
>+        return "Numpad6"_s;
>+    case 0x0056:
>+        return "NumpadAdd"_s;
>+    case 0x0057:
>+        return "Numpad1"_s;
>+    case 0x0058:
>+        return "Numpad2"_s;
>+    case 0x0059:
>+        return "Numpad3"_s;
>+    case 0x005A:
>+        return "Numpad0"_s;
>+    case 0x005B:
>+        return "NumpadDecimal"_s;
>+    case 0x005E:
>+        return "IntlBackslash"_s;
>+    case 0x005F:
>+        return "F11"_s;
>+    case 0x0060:
>+        return "F12"_s;
>+    case 0x0061:
>+        return "IntlRo"_s;
>+    case 0x0064:
>+        return "Convert"_s;
>+    case 0x0065:
>+        return "KanaMode"_s;
>+    case 0x0066:
>+        return "NonConvert"_s;
>+    case 0x0068:
>+        return "NumpadEnter"_s;
>+    case 0x0069:
>+        return "ControlRight"_s;
>+    case 0x006A:
>+        return "NumpadDivide"_s;
>+    case 0x006B:
>+        return "PrintScreen"_s;
>+    case 0x006C:
>+        return "AltRight"_s;
>+    case 0x006E:
>+        return "Home"_s;
>+    case 0x006F:
>+        return "ArrowUp"_s;
>+    case 0x0070:
>+        return "PageUp"_s;
>+    case 0x0071:
>+        return "ArrowLeft"_s;
>+    case 0x0072:
>+        return "ArrowRight"_s;
>+    case 0x0073:
>+        return "End"_s;
>+    case 0x0074:
>+        return "ArrowDown"_s;
>+    case 0x0075:
>+        return "PageDown"_s;
>+    case 0x0076:
>+        return "Insert"_s;
>+    case 0x0077:
>+        return "Delete"_s;
>+    case 0x0079:
>+        return "AudioVolumeMute"_s;
>+    case 0x007A:
>+        return "AudioVolumeDown"_s;
>+    case 0x007B:
>+        return "AudioVolumeUp"_s;
>+    case 0x007D:
>+        return "NumpadEqual"_s;
>+    case 0x007F:
>+        return "Pause"_s;
>+    case 0x0081:
>+        return "NumpadComma"_s;
>+    case 0x0082:
>+        return "Lang1"_s;
>+    case 0x0083:
>+        return "Lang2"_s;
>+    case 0x0084:
>+        return "IntlYen"_s;
>+    case 0x0085:
>+        return "OSLeft"_s;
>+    case 0x0086:
>+        return "OSRight"_s;
>+    case 0x0087:
>+        return "ContextMenu"_s;
>+    case 0x0088:
>+        return "BrowserStop"_s;
>+    case 0x0089:
>+        return "Again"_s;
>+    case 0x008A:
>+        return "Props"_s;
>+    case 0x008B:
>+        return "Undo"_s;
>+    case 0x008C:
>+        return "Select"_s;
>+    case 0x008D:
>+        return "Copy"_s;
>+    case 0x008E:
>+        return "Open"_s;
>+    case 0x008F:
>+        return "Paste"_s;
>+    case 0x0090:
>+        return "Find"_s;
>+    case 0x0091:
>+        return "Cut"_s;
>+    case 0x0092:
>+        return "Help"_s;
>+    case 0x0094:
>+        return "LaunchApp2"_s;
>+    case 0x0097:
>+        return "WakeUp"_s;
>+    case 0x0098:
>+        return "LaunchApp1"_s;
>+    case 0x00A3:
>+        return "LaunchMail"_s;
>+    case 0x00A4:
>+        return "BrowserFavorites"_s;
>+    case 0x00A6:
>+        return "BrowserBack"_s;
>+    case 0x00A7:
>+        return "BrowserForward"_s;
>+    case 0x00A9:
>+        return "Eject"_s;
>+    case 0x00AB:
>+        return "MediaTrackNext"_s;
>+    case 0x00AC:
>+        return "MediaPlayPause"_s;
>+    case 0x00AD:
>+        return "MediaTrackPrevious"_s;
>+    case 0x00AE:
>+        return "MediaStop"_s;
>+    case 0x00B3:
>+        return "LaunchMediaPlayer"_s;
>+    case 0x00B4:
>+        return "BrowserHome"_s;
>+    case 0x00B5:
>+        return "BrowserRefresh"_s;
>+    case 0x00BF:
>+        return "F13"_s;
>+    case 0x00C0:
>+        return "F14"_s;
>+    case 0x00C1:
>+        return "F15"_s;
>+    case 0x00C2:
>+        return "F16"_s;
>+    case 0x00C3:
>+        return "F17"_s;
>+    case 0x00C4:
>+        return "F18"_s;
>+    case 0x00C5:
>+        return "F19"_s;
>+    case 0x00C6:
>+        return "F20"_s;
>+    case 0x00C7:
>+        return "F21"_s;
>+    case 0x00C8:
>+        return "F22"_s;
>+    case 0x00C9:
>+        return "F23"_s;
>+    case 0x00CA:
>+        return "F24"_s;
>+    case 0x00E1:
>+        return "BrowserSearch"_s;
>+    default:
>+        break;
>+    }
>+    return "Unidentified"_s;
>+}
>+
>+// FIXME: This is incomplete. We should change this to mirror
>+// more like what Firefox does, and generate these switch statements
>+// at build time.
>+String PlatformKeyboardEvent::keyIdentifierForWPEKeyCode(unsigned keyCode)
>+{
>+    switch (keyCode) {
>+    case WPE_KEY_Menu:
>+    case WPE_KEY_Alt_L:
>+    case WPE_KEY_Alt_R:
>+        return "Alt";
>+    case WPE_KEY_Clear:
>+        return "Clear";
>+    case WPE_KEY_Down:
>+        return "Down";
>+        // "End"
>+    case WPE_KEY_End:
>+        return "End";
>+        // "Enter"
>+    case WPE_KEY_ISO_Enter:
>+    case WPE_KEY_KP_Enter:
>+    case WPE_KEY_Return:
>+        return "Enter";
>+    case WPE_KEY_Execute:
>+        return "Execute";
>+    case WPE_KEY_F1:
>+        return "F1";
>+    case WPE_KEY_F2:
>+        return "F2";
>+    case WPE_KEY_F3:
>+        return "F3";
>+    case WPE_KEY_F4:
>+        return "F4";
>+    case WPE_KEY_F5:
>+        return "F5";
>+    case WPE_KEY_F6:
>+        return "F6";
>+    case WPE_KEY_F7:
>+        return "F7";
>+    case WPE_KEY_F8:
>+        return "F8";
>+    case WPE_KEY_F9:
>+        return "F9";
>+    case WPE_KEY_F10:
>+        return "F10";
>+    case WPE_KEY_F11:
>+        return "F11";
>+    case WPE_KEY_F12:
>+        return "F12";
>+    case WPE_KEY_F13:
>+        return "F13";
>+    case WPE_KEY_F14:
>+        return "F14";
>+    case WPE_KEY_F15:
>+        return "F15";
>+    case WPE_KEY_F16:
>+        return "F16";
>+    case WPE_KEY_F17:
>+        return "F17";
>+    case WPE_KEY_F18:
>+        return "F18";
>+    case WPE_KEY_F19:
>+        return "F19";
>+    case WPE_KEY_F20:
>+        return "F20";
>+    case WPE_KEY_F21:
>+        return "F21";
>+    case WPE_KEY_F22:
>+        return "F22";
>+    case WPE_KEY_F23:
>+        return "F23";
>+    case WPE_KEY_F24:
>+        return "F24";
>+    case WPE_KEY_Help:
>+        return "Help";
>+    case WPE_KEY_Home:
>+        return "Home";
>+    case WPE_KEY_Insert:
>+        return "Insert";
>+    case WPE_KEY_Left:
>+        return "Left";
>+    case WPE_KEY_Page_Down:
>+        return "PageDown";
>+    case WPE_KEY_Page_Up:
>+        return "PageUp";
>+    case WPE_KEY_Pause:
>+        return "Pause";
>+    case WPE_KEY_3270_PrintScreen:
>+    case WPE_KEY_Print:
>+        return "PrintScreen";
>+    case WPE_KEY_Right:
>+        return "Right";
>+    case WPE_KEY_Select:
>+        return "Select";
>+    case WPE_KEY_Up:
>+        return "Up";
>+        // Standard says that DEL becomes U+007F.
>+    case WPE_KEY_Delete:
>+        return "U+007F";
>+    case WPE_KEY_BackSpace:
>+        return "U+0008";
>+    case WPE_KEY_ISO_Left_Tab:
>+    case WPE_KEY_3270_BackTab:
>+    case WPE_KEY_Tab:
>+        return "U+0009";
>+    default:
>+        break;
>+    }
>+
>+    return String::format("U+%04X", wpe_key_code_to_unicode(keyCode));
>+}
>+
>+int PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode(unsigned keycode)
>+{
>+    switch (keycode) {
>+    case WPE_KEY_KP_0:
>+        return VK_NUMPAD0; // (60) Numeric keypad 0 key
>+    case WPE_KEY_KP_1:
>+        return VK_NUMPAD1; // (61) Numeric keypad 1 key
>+    case WPE_KEY_KP_2:
>+        return VK_NUMPAD2; // (62) Numeric keypad 2 key
>+    case WPE_KEY_KP_3:
>+        return VK_NUMPAD3; // (63) Numeric keypad 3 key
>+    case WPE_KEY_KP_4:
>+        return VK_NUMPAD4; // (64) Numeric keypad 4 key
>+    case WPE_KEY_KP_5:
>+        return VK_NUMPAD5; // (65) Numeric keypad 5 key
>+    case WPE_KEY_KP_6:
>+        return VK_NUMPAD6; // (66) Numeric keypad 6 key
>+    case WPE_KEY_KP_7:
>+        return VK_NUMPAD7; // (67) Numeric keypad 7 key
>+    case WPE_KEY_KP_8:
>+        return VK_NUMPAD8; // (68) Numeric keypad 8 key
>+    case WPE_KEY_KP_9:
>+        return VK_NUMPAD9; // (69) Numeric keypad 9 key
>+    case WPE_KEY_KP_Multiply:
>+        return VK_MULTIPLY; // (6A) Multiply key
>+    case WPE_KEY_KP_Add:
>+        return VK_ADD; // (6B) Add key
>+    case WPE_KEY_KP_Subtract:
>+        return VK_SUBTRACT; // (6D) Subtract key
>+    case WPE_KEY_KP_Decimal:
>+        return VK_DECIMAL; // (6E) Decimal key
>+    case WPE_KEY_KP_Divide:
>+        return VK_DIVIDE; // (6F) Divide key
>+
>+    case WPE_KEY_KP_Page_Up:
>+        return VK_PRIOR; // (21) PAGE UP key
>+    case WPE_KEY_KP_Page_Down:
>+        return VK_NEXT; // (22) PAGE DOWN key
>+    case WPE_KEY_KP_End:
>+        return VK_END; // (23) END key
>+    case WPE_KEY_KP_Home:
>+        return VK_HOME; // (24) HOME key
>+    case WPE_KEY_KP_Left:
>+        return VK_LEFT; // (25) LEFT ARROW key
>+    case WPE_KEY_KP_Up:
>+        return VK_UP; // (26) UP ARROW key
>+    case WPE_KEY_KP_Right:
>+        return VK_RIGHT; // (27) RIGHT ARROW key
>+    case WPE_KEY_KP_Down:
>+        return VK_DOWN; // (28) DOWN ARROW key
>+
>+    case WPE_KEY_BackSpace:
>+        return VK_BACK; // (08) BACKSPACE key
>+    case WPE_KEY_ISO_Left_Tab:
>+    case WPE_KEY_3270_BackTab:
>+    case WPE_KEY_Tab:
>+        return VK_TAB; // (09) TAB key
>+    case WPE_KEY_Clear:
>+        return VK_CLEAR; // (0C) CLEAR key
>+    case WPE_KEY_ISO_Enter:
>+    case WPE_KEY_KP_Enter:
>+    case WPE_KEY_Return:
>+        return VK_RETURN; // (0D) Return key
>+
>+        // VK_SHIFT (10) SHIFT key
>+        // VK_CONTROL (11) CTRL key
>+
>+    case WPE_KEY_Menu:
>+        return VK_APPS; // (5D) Applications key (Natural keyboard)
>+
>+        // VK_MENU (12) ALT key
>+
>+    case WPE_KEY_Pause:
>+        return VK_PAUSE; // (13) PAUSE key
>+    case WPE_KEY_Caps_Lock:
>+        return VK_CAPITAL; // (14) CAPS LOCK key
>+    case WPE_KEY_Kana_Lock:
>+    case WPE_KEY_Kana_Shift:
>+        return VK_KANA; // (15) Input Method Editor (IME) Kana mode
>+    case WPE_KEY_Hangul:
>+        return VK_HANGUL; // VK_HANGUL (15) IME Hangul mode
>+        // VK_JUNJA (17) IME Junja mode
>+        // VK_FINAL (18) IME final mode
>+    case WPE_KEY_Hangul_Hanja:
>+        return VK_HANJA; // (19) IME Hanja mode
>+    case WPE_KEY_Kanji:
>+        return VK_KANJI; // (19) IME Kanji mode
>+    case WPE_KEY_Escape:
>+        return VK_ESCAPE; // (1B) ESC key
>+        // VK_CONVERT (1C) IME convert
>+        // VK_NONCONVERT (1D) IME nonconvert
>+        // VK_ACCEPT (1E) IME accept
>+        // VK_MODECHANGE (1F) IME mode change request
>+    case WPE_KEY_space:
>+        return VK_SPACE; // (20) SPACEBAR
>+    case WPE_KEY_Page_Up:
>+        return VK_PRIOR; // (21) PAGE UP key
>+    case WPE_KEY_Page_Down:
>+        return VK_NEXT; // (22) PAGE DOWN key
>+    case WPE_KEY_End:
>+        return VK_END; // (23) END key
>+    case WPE_KEY_Home:
>+        return VK_HOME; // (24) HOME key
>+    case WPE_KEY_Left:
>+        return VK_LEFT; // (25) LEFT ARROW key
>+    case WPE_KEY_Up:
>+        return VK_UP; // (26) UP ARROW key
>+    case WPE_KEY_Right:
>+        return VK_RIGHT; // (27) RIGHT ARROW key
>+    case WPE_KEY_Down:
>+        return VK_DOWN; // (28) DOWN ARROW key
>+    case WPE_KEY_Select:
>+        return VK_SELECT; // (29) SELECT key
>+    case WPE_KEY_Print:
>+        return VK_SNAPSHOT; // (2C) PRINT SCREEN key
>+    case WPE_KEY_Execute:
>+        return VK_EXECUTE; // (2B) EXECUTE key
>+    case WPE_KEY_Insert:
>+    case WPE_KEY_KP_Insert:
>+        return VK_INSERT; // (2D) INS key
>+    case WPE_KEY_Delete:
>+    case WPE_KEY_KP_Delete:
>+        return VK_DELETE; // (2E) DEL key
>+    case WPE_KEY_Help:
>+        return VK_HELP; // (2F) HELP key
>+    case WPE_KEY_0:
>+    case WPE_KEY_parenright:
>+        return VK_0; // (30) 0) key
>+    case WPE_KEY_1:
>+    case WPE_KEY_exclam:
>+        return VK_1; // (31) 1 ! key
>+    case WPE_KEY_2:
>+    case WPE_KEY_at:
>+        return VK_2; // (32) 2 & key
>+    case WPE_KEY_3:
>+    case WPE_KEY_numbersign:
>+        return VK_3; // case '3': case '#';
>+    case WPE_KEY_4:
>+    case WPE_KEY_dollar: // (34) 4 key '$';
>+        return VK_4;
>+    case WPE_KEY_5:
>+    case WPE_KEY_percent:
>+        return VK_5; // (35) 5 key  '%'
>+    case WPE_KEY_6:
>+    case WPE_KEY_asciicircum:
>+        return VK_6; // (36) 6 key  '^'
>+    case WPE_KEY_7:
>+    case WPE_KEY_ampersand:
>+        return VK_7; // (37) 7 key  case '&'
>+    case WPE_KEY_8:
>+    case WPE_KEY_asterisk:
>+        return VK_8; // (38) 8 key  '*'
>+    case WPE_KEY_9:
>+    case WPE_KEY_parenleft:
>+        return VK_9; // (39) 9 key '('
>+    case WPE_KEY_a:
>+    case WPE_KEY_A:
>+        return VK_A; // (41) A key case 'a': case 'A': return 0x41;
>+    case WPE_KEY_b:
>+    case WPE_KEY_B:
>+        return VK_B; // (42) B key case 'b': case 'B': return 0x42;
>+    case WPE_KEY_c:
>+    case WPE_KEY_C:
>+        return VK_C; // (43) C key case 'c': case 'C': return 0x43;
>+    case WPE_KEY_d:
>+    case WPE_KEY_D:
>+        return VK_D; // (44) D key case 'd': case 'D': return 0x44;
>+    case WPE_KEY_e:
>+    case WPE_KEY_E:
>+        return VK_E; // (45) E key case 'e': case 'E': return 0x45;
>+    case WPE_KEY_f:
>+    case WPE_KEY_F:
>+        return VK_F; // (46) F key case 'f': case 'F': return 0x46;
>+    case WPE_KEY_g:
>+    case WPE_KEY_G:
>+        return VK_G; // (47) G key case 'g': case 'G': return 0x47;
>+    case WPE_KEY_h:
>+    case WPE_KEY_H:
>+        return VK_H; // (48) H key case 'h': case 'H': return 0x48;
>+    case WPE_KEY_i:
>+    case WPE_KEY_I:
>+        return VK_I; // (49) I key case 'i': case 'I': return 0x49;
>+    case WPE_KEY_j:
>+    case WPE_KEY_J:
>+        return VK_J; // (4A) J key case 'j': case 'J': return 0x4A;
>+    case WPE_KEY_k:
>+    case WPE_KEY_K:
>+        return VK_K; // (4B) K key case 'k': case 'K': return 0x4B;
>+    case WPE_KEY_l:
>+    case WPE_KEY_L:
>+        return VK_L; // (4C) L key case 'l': case 'L': return 0x4C;
>+    case WPE_KEY_m:
>+    case WPE_KEY_M:
>+        return VK_M; // (4D) M key case 'm': case 'M': return 0x4D;
>+    case WPE_KEY_n:
>+    case WPE_KEY_N:
>+        return VK_N; // (4E) N key case 'n': case 'N': return 0x4E;
>+    case WPE_KEY_o:
>+    case WPE_KEY_O:
>+        return VK_O; // (4F) O key case 'o': case 'O': return 0x4F;
>+    case WPE_KEY_p:
>+    case WPE_KEY_P:
>+        return VK_P; // (50) P key case 'p': case 'P': return 0x50;
>+    case WPE_KEY_q:
>+    case WPE_KEY_Q:
>+        return VK_Q; // (51) Q key case 'q': case 'Q': return 0x51;
>+    case WPE_KEY_r:
>+    case WPE_KEY_R:
>+        return VK_R; // (52) R key case 'r': case 'R': return 0x52;
>+    case WPE_KEY_s:
>+    case WPE_KEY_S:
>+        return VK_S; // (53) S key case 's': case 'S': return 0x53;
>+    case WPE_KEY_t:
>+    case WPE_KEY_T:
>+        return VK_T; // (54) T key case 't': case 'T': return 0x54;
>+    case WPE_KEY_u:
>+    case WPE_KEY_U:
>+        return VK_U; // (55) U key case 'u': case 'U': return 0x55;
>+    case WPE_KEY_v:
>+    case WPE_KEY_V:
>+        return VK_V; // (56) V key case 'v': case 'V': return 0x56;
>+    case WPE_KEY_w:
>+    case WPE_KEY_W:
>+        return VK_W; // (57) W key case 'w': case 'W': return 0x57;
>+    case WPE_KEY_x:
>+    case WPE_KEY_X:
>+        return VK_X; // (58) X key case 'x': case 'X': return 0x58;
>+    case WPE_KEY_y:
>+    case WPE_KEY_Y:
>+        return VK_Y; // (59) Y key case 'y': case 'Y': return 0x59;
>+    case WPE_KEY_z:
>+    case WPE_KEY_Z:
>+        return VK_Z; // (5A) Z key case 'z': case 'Z': return 0x5A;
>+    case WPE_KEY_Meta_L:
>+        return VK_LWIN; // (5B) Left Windows key (Microsoft Natural keyboard)
>+    case WPE_KEY_Meta_R:
>+        return VK_RWIN; // (5C) Right Windows key (Natural keyboard)
>+        // VK_SLEEP (5F) Computer Sleep key
>+        // VK_SEPARATOR (6C) Separator key
>+        // VK_SUBTRACT (6D) Subtract key
>+        // VK_DECIMAL (6E) Decimal key
>+        // VK_DIVIDE (6F) Divide key
>+        // handled by key code above
>+
>+    case WPE_KEY_Num_Lock:
>+        return VK_NUMLOCK; // (90) NUM LOCK key
>+
>+    case WPE_KEY_Scroll_Lock:
>+        return VK_SCROLL; // (91) SCROLL LOCK key
>+
>+    case WPE_KEY_Shift_L:
>+        return VK_LSHIFT; // (A0) Left SHIFT key
>+    case WPE_KEY_Shift_R:
>+        return VK_RSHIFT; // (A1) Right SHIFT key
>+    case WPE_KEY_Control_L:
>+        return VK_LCONTROL; // (A2) Left CONTROL key
>+    case WPE_KEY_Control_R:
>+        return VK_RCONTROL; // (A3) Right CONTROL key
>+    case WPE_KEY_Alt_L:
>+        return VK_LMENU; // (A4) Left MENU key
>+    case WPE_KEY_Alt_R:
>+        return VK_RMENU; // (A5) Right MENU key
>+
>+        // VK_BROWSER_BACK (A6) Windows 2000/XP: Browser Back key
>+        // VK_BROWSER_FORWARD (A7) Windows 2000/XP: Browser Forward key
>+        // VK_BROWSER_REFRESH (A8) Windows 2000/XP: Browser Refresh key
>+        // VK_BROWSER_STOP (A9) Windows 2000/XP: Browser Stop key
>+        // VK_BROWSER_SEARCH (AA) Windows 2000/XP: Browser Search key
>+        // VK_BROWSER_FAVORITES (AB) Windows 2000/XP: Browser Favorites key
>+        // VK_BROWSER_HOME (AC) Windows 2000/XP: Browser Start and Home key
>+        // VK_VOLUME_MUTE (AD) Windows 2000/XP: Volume Mute key
>+        // VK_VOLUME_DOWN (AE) Windows 2000/XP: Volume Down key
>+        // VK_VOLUME_UP (AF) Windows 2000/XP: Volume Up key
>+        // VK_MEDIA_NEXT_TRACK (B0) Windows 2000/XP: Next Track key
>+        // VK_MEDIA_PREV_TRACK (B1) Windows 2000/XP: Previous Track key
>+        // VK_MEDIA_STOP (B2) Windows 2000/XP: Stop Media key
>+        // VK_MEDIA_PLAY_PAUSE (B3) Windows 2000/XP: Play/Pause Media key
>+        // VK_LAUNCH_MAIL (B4) Windows 2000/XP: Start Mail key
>+        // VK_LAUNCH_MEDIA_SELECT (B5) Windows 2000/XP: Select Media key
>+        // VK_LAUNCH_APP1 (B6) Windows 2000/XP: Start Application 1 key
>+        // VK_LAUNCH_APP2 (B7) Windows 2000/XP: Start Application 2 key
>+
>+        // VK_OEM_1 (BA) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the ';:' key
>+    case WPE_KEY_semicolon:
>+    case WPE_KEY_colon:
>+        return VK_OEM_1; // case ';': case ':': return 0xBA;
>+        // VK_OEM_PLUS (BB) Windows 2000/XP: For any country/region, the '+' key
>+    case WPE_KEY_plus:
>+    case WPE_KEY_equal:
>+        return VK_OEM_PLUS; // case '=': case '+': return 0xBB;
>+        // VK_OEM_COMMA (BC) Windows 2000/XP: For any country/region, the ',' key
>+    case WPE_KEY_comma:
>+    case WPE_KEY_less:
>+        return VK_OEM_COMMA; // case ',': case '<': return 0xBC;
>+        // VK_OEM_MINUS (BD) Windows 2000/XP: For any country/region, the '-' key
>+    case WPE_KEY_minus:
>+    case WPE_KEY_underscore:
>+        return VK_OEM_MINUS; // case '-': case '_': return 0xBD;
>+        // VK_OEM_PERIOD (BE) Windows 2000/XP: For any country/region, the '.' key
>+    case WPE_KEY_period:
>+    case WPE_KEY_greater:
>+        return VK_OEM_PERIOD; // case '.': case '>': return 0xBE;
>+        // VK_OEM_2 (BF) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '/?' key
>+    case WPE_KEY_slash:
>+    case WPE_KEY_question:
>+        return VK_OEM_2; // case '/': case '?': return 0xBF;
>+        // VK_OEM_3 (C0) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '`~' key
>+    case WPE_KEY_asciitilde:
>+    case WPE_KEY_quoteleft:
>+        return VK_OEM_3; // case '`': case '~': return 0xC0;
>+        // VK_OEM_4 (DB) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '[{' key
>+    case WPE_KEY_bracketleft:
>+    case WPE_KEY_braceleft:
>+        return VK_OEM_4; // case '[': case '{': return 0xDB;
>+        // VK_OEM_5 (DC) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '\|' key
>+    case WPE_KEY_backslash:
>+    case WPE_KEY_bar:
>+        return VK_OEM_5; // case '\\': case '|': return 0xDC;
>+        // VK_OEM_6 (DD) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the ']}' key
>+    case WPE_KEY_bracketright:
>+    case WPE_KEY_braceright:
>+        return VK_OEM_6; // case ']': case '}': return 0xDD;
>+        // VK_OEM_7 (DE) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the 'single-quote/double-quote' key
>+    case WPE_KEY_quoteright:
>+    case WPE_KEY_quotedbl:
>+        return VK_OEM_7; // case '\'': case '"': return 0xDE;
>+        // VK_OEM_8 (DF) Used for miscellaneous characters; it can vary by keyboard.
>+        // VK_OEM_102 (E2) Windows 2000/XP: Either the angle bracket key or the backslash key on the RT 102-key keyboard
>+        // VK_PROCESSKEY (E5) Windows 95/98/Me, Windows NT 4.0, Windows 2000/XP: IME PROCESS key
>+        // VK_PACKET (E7) Windows 2000/XP: Used to pass Unicode characters as if they were keystrokes. The VK_PACKET key is the low word of a 32-bit Virtual Key value used for non-keyboard input methods. For more information, see Remark in KEYBDINPUT,SendInput, WM_KEYDOWN, and WM_KEYUP
>+        // VK_ATTN (F6) Attn key
>+        // VK_CRSEL (F7) CrSel key
>+        // VK_EXSEL (F8) ExSel key
>+        // VK_EREOF (F9) Erase EOF key
>+        // VK_PLAY (FA) Play key
>+        // VK_ZOOM (FB) Zoom key
>+        // VK_NONAME (FC) Reserved for future use
>+        // VK_PA1 (FD) PA1 key
>+        // VK_OEM_CLEAR (FE) Clear key
>+    case WPE_KEY_F1:
>+    case WPE_KEY_F2:
>+    case WPE_KEY_F3:
>+    case WPE_KEY_F4:
>+    case WPE_KEY_F5:
>+    case WPE_KEY_F6:
>+    case WPE_KEY_F7:
>+    case WPE_KEY_F8:
>+    case WPE_KEY_F9:
>+    case WPE_KEY_F10:
>+    case WPE_KEY_F11:
>+    case WPE_KEY_F12:
>+    case WPE_KEY_F13:
>+    case WPE_KEY_F14:
>+    case WPE_KEY_F15:
>+    case WPE_KEY_F16:
>+    case WPE_KEY_F17:
>+    case WPE_KEY_F18:
>+    case WPE_KEY_F19:
>+    case WPE_KEY_F20:
>+    case WPE_KEY_F21:
>+    case WPE_KEY_F22:
>+    case WPE_KEY_F23:
>+    case WPE_KEY_F24:
>+        return VK_F1 + (keycode - WPE_KEY_F1);
>+    case WPE_KEY_VoidSymbol:
>+        return VK_PROCESSKEY;
>+    default:
>+        break;
>+    }
>+
>+    return 0;
>+}
>+
>+String PlatformKeyboardEvent::singleCharacterString(unsigned val)
>+{
>+    switch (val) {
>+    case WPE_KEY_ISO_Enter:
>+    case WPE_KEY_KP_Enter:
>+    case WPE_KEY_Return:
>+        return String("\r");
>+    case WPE_KEY_BackSpace:
>+        return String("\x8");
>+    case WPE_KEY_Tab:
>+        return String("\t");
>+    default:
>+        break;
>+    }
>+
>+    gunichar c = wpe_key_code_to_unicode(val);
>+    glong length;
>+    GUniquePtr<gunichar2> uchar16(g_ucs4_to_utf16(&c, 1, nullptr, &length, nullptr));
>+    if (uchar16)
>+        return String(reinterpret_cast<UChar*>(uchar16.get()), length);
>+
>+    return { };
>+}
>+
> void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool backwardsCompatibility)
> {
>     ASSERT(m_type == KeyDown);
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1473d312500..83e915d5065 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-03  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [WPE] Use WPE key symbols and new API instead of xkbcommon and the key mapper
>+        https://bugs.webkit.org/show_bug.cgi?id=188093
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        
>+
>+        * Shared/WebEvent.h: Add WebKeyboardEvent constructor for WPE.
>+        * Shared/WebKeyboardEvent.cpp:
>+        (WebKit::WebKeyboardEvent::WebKeyboardEvent): WebKeyboardEvent constructor for WPE.
>+        * Shared/wpe/WebEventFactory.cpp:
>+        (WebKit::isWPEKeyCodeFromKeyPad): Helper tpo check if a key symbols is from key pad.
>+        (WebKit::WebEventFactory::createWebKeyboardEvent): Use PlatformKeyboardEvent API to provide key code, hardware
>+        key code, key identifier and windows key code to WebKeyboardEvent.
>+        * UIProcess/API/wpe/WPEView.cpp:
>+        (WKWPE::m_backend): Use WPE key symbols.
>+
> 2018-08-02  Tim Horton  <timothy_horton@apple.com>
> 
>         PDFPlugin: Context menus in RTL are left-aligned
>diff --git a/Source/WebKit/Shared/WebEvent.h b/Source/WebKit/Shared/WebEvent.h
>index d625d2b89a3..2fd01a206af 100644
>--- a/Source/WebKit/Shared/WebEvent.h
>+++ b/Source/WebKit/Shared/WebEvent.h
>@@ -258,6 +258,8 @@ public:
>     WebKeyboardEvent(Type, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool handledByInputMethod, Vector<String>&& commands, bool isKeypad, Modifiers, WallTime timestamp);
> #elif PLATFORM(IOS)
>     WebKeyboardEvent(Type, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers, WallTime timestamp);
>+#elif PLATFORM(WPE)
>+    WebKeyboardEvent(Type, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isKeypad, Modifiers, WallTime timestamp);
> #else
>     WebKeyboardEvent(Type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers, WallTime timestamp);
> #endif
>diff --git a/Source/WebKit/Shared/WebKeyboardEvent.cpp b/Source/WebKit/Shared/WebKeyboardEvent.cpp
>index 0cf27199621..ce2e556e328 100644
>--- a/Source/WebKit/Shared/WebKeyboardEvent.cpp
>+++ b/Source/WebKit/Shared/WebKeyboardEvent.cpp
>@@ -104,6 +104,25 @@ WebKeyboardEvent::WebKeyboardEvent(Type type, const String& text, const String&
>     ASSERT(isKeyboardEventType(type));
> }
> 
>+#elif PLATFORM(WPE)
>+
>+WebKeyboardEvent::WebKeyboardEvent(Type type, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isKeypad, Modifiers modifiers, WallTime timestamp)
>+    : WebEvent(type, modifiers, timestamp)
>+    , m_text(text)
>+    , m_unmodifiedText(text)
>+    , m_key(key)
>+    , m_code(code)
>+    , m_keyIdentifier(keyIdentifier)
>+    , m_windowsVirtualKeyCode(windowsVirtualKeyCode)
>+    , m_nativeVirtualKeyCode(nativeVirtualKeyCode)
>+    , m_macCharCode(0)
>+    , m_isAutoRepeat(false)
>+    , m_isKeypad(isKeypad)
>+    , m_isSystemKey(false)
>+{
>+    ASSERT(isKeyboardEventType(type));
>+}
>+
> #else
> 
> WebKeyboardEvent::WebKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers, WallTime timestamp)
>diff --git a/Source/WebKit/Shared/wpe/WebEventFactory.cpp b/Source/WebKit/Shared/wpe/WebEventFactory.cpp
>index 7ceaf6697b2..f3976c29f61 100644
>--- a/Source/WebKit/Shared/wpe/WebEventFactory.cpp
>+++ b/Source/WebKit/Shared/wpe/WebEventFactory.cpp
>@@ -26,13 +26,18 @@
> #include "config.h"
> #include "WebEventFactory.h"
> 
>+#include <WebCore/PlatformKeyboardEvent.h>
> #include <WebCore/Scrollbar.h>
> #include <cmath>
> #include <wpe/wpe.h>
>-#include <wtf/glib/GUniquePtr.h>
> 
> namespace WebKit {
> 
>+static inline bool isWPEKeyCodeFromKeyPad(unsigned keyCode)
>+{
>+    return keyCode >= WPE_KEY_KP_Space && keyCode <= WPE_KEY_KP_9;
>+}
>+
> static WebEvent::Modifiers modifiersForEvent(struct wpe_input_keyboard_event* event)
> {
>     unsigned modifiers = 0;
>@@ -50,28 +55,6 @@ static WebEvent::Modifiers modifiersForEvent(struct wpe_input_keyboard_event* ev
>     return static_cast<WebEvent::Modifiers>(modifiers);
> }
> 
>-static String singleCharacterStringForKeyEvent(struct wpe_input_keyboard_event* event)
>-{
>-    const char* singleCharacter = wpe_input_single_character_for_key_event(wpe_input_key_mapper_get_singleton(), event);
>-    if (singleCharacter)
>-        return String(singleCharacter);
>-
>-    glong length;
>-    GUniquePtr<gunichar2> uchar16(g_ucs4_to_utf16(&event->unicode, 1, 0, &length, nullptr));
>-    if (uchar16)
>-        return String(reinterpret_cast<UChar*>(uchar16.get()), length);
>-    return String();
>-}
>-
>-static String identifierStringForKeyEvent(struct wpe_input_keyboard_event* event)
>-{
>-    const char* identifier = wpe_input_identifier_for_key_event(wpe_input_key_mapper_get_singleton(), event);
>-    if (identifier)
>-        return String(identifier);
>-
>-    return String::format("U+%04X", event->unicode);
>-}
>-
> WallTime wallTimeForEventTime(uint64_t timestamp)
> {
>     // This works if and only if the WPE backend uses CLOCK_MONOTONIC for its
>@@ -84,14 +67,18 @@ WallTime wallTimeForEventTime(uint64_t timestamp)
> 
> WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(struct wpe_input_keyboard_event* event)
> {
>-    String singleCharacterString = singleCharacterStringForKeyEvent(event);
>-    String identifierString = identifierStringForKeyEvent(event);
>+    String singleCharacterString = WebCore::PlatformKeyboardEvent::singleCharacterString(event->key_code);
> 
>     return WebKeyboardEvent(event->pressed ? WebEvent::KeyDown : WebEvent::KeyUp,
>-        singleCharacterString, singleCharacterString, identifierString,
>-        wpe_input_windows_key_code_for_key_event(wpe_input_key_mapper_get_singleton(), event),
>-        event->keyCode, 0, false, false, false,
>-        modifiersForEvent(event), wallTimeForEventTime(event->time));
>+        WebCore::PlatformKeyboardEvent::singleCharacterString(event->key_code),
>+        WebCore::PlatformKeyboardEvent::keyValueForWPEKeyCode(event->key_code),
>+        WebCore::PlatformKeyboardEvent::keyCodeForHardwareKeyCode(event->hardware_key_code),
>+        WebCore::PlatformKeyboardEvent::keyIdentifierForWPEKeyCode(event->key_code),
>+        WebCore::PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode(event->key_code),
>+        event->key_code,
>+        isWPEKeyCodeFromKeyPad(event->key_code),
>+        modifiersForEvent(event),
>+        wallTimeForEventTime(event->time));
> }
> 
> WebMouseEvent WebEventFactory::createWebMouseEvent(struct wpe_input_pointer_event* event, float deviceScaleFactor)
>diff --git a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>index 48d8044135f..85bed5fe16b 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>+++ b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>@@ -104,7 +104,7 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
>             if (event->pressed
>                 && event->modifiers & wpe_input_keyboard_modifier_control
>                 && event->modifiers & wpe_input_keyboard_modifier_shift
>-                && event->keyCode == 'G') {
>+                && event->key_code == WPE_KEY_G) {
>                 auto& preferences = view.page().preferences();
>                 preferences.setResourceUsageOverlayVisible(!preferences.resourceUsageOverlayVisible());
>                 return;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index faadf2f3840..27068d66769 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-08-03  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [WPE] Use WPE key symbols and new API instead of xkbcommon and the key mapper
>+        https://bugs.webkit.org/show_bug.cgi?id=188093
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        
>+
>+        * MiniBrowser/wpe/main.cpp: Use WPE key symbols.
>+        * WebKitTestRunner/wpe/EventSenderProxyWPE.cpp:
>+        (WTR::wpeKeySymForKeyRef): Use WPE key symbols and wpe_unicode_to_key_code().
>+        (WTR::EventSenderProxy::keyDown): Do not set unicode char to the event since it was removed.
>+        * flatpak/org.webkit.WPE.yaml: Bump WPEBackend and WPEBackend-fdo versions.
>+        * wpe/backends/WindowViewBackend.cpp:
>+        (WPEToolingBackends::WindowViewBackend::handleKeyEvent): Do not set unicode char to the event since it was removed.
>+        * wpe/jhbuild.modules: Bump WPEBackend and WPEBackend-fdo versions.
>+
> 2018-08-02  Nan Wang  <n_wang@apple.com>
> 
>         AX: [iOS] add support to return the attributed string under the element
>diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
>index a490c4b48de..3f76942a46d 100644
>--- a/Tools/MiniBrowser/wpe/main.cpp
>+++ b/Tools/MiniBrowser/wpe/main.cpp
>@@ -64,7 +64,7 @@ public:
> 
>     bool dispatchKeyboardEvent(struct wpe_input_keyboard_event* event) override
>     {
>-        if (event->pressed && event->modifiers & wpe_input_keyboard_modifier_control && event->keyCode == 'q') {
>+        if (event->pressed && event->modifiers & wpe_input_keyboard_modifier_control && event->key_code == WPE_KEY_q) {
>             g_main_loop_quit(m_loop);
>             return true;
>         }
>diff --git a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
>index aab11e75515..1d62f2bb66a 100644
>--- a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
>+++ b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
>@@ -31,8 +31,6 @@
> #include "TestController.h"
> #include <WebCore/NotImplemented.h>
> #include <wpe/wpe.h>
>-#include <xkbcommon/xkbcommon-keysyms.h>
>-#include <xkbcommon/xkbcommon.h>
> 
> namespace WTR {
> 
>@@ -160,93 +158,93 @@ static uint8_t wkEventModifiersToWPE(WKEventModifiers wkModifiers)
>     return modifiers;
> }
> 
>-int getXKBKeySymForKeyRef(WKStringRef keyRef, unsigned location, uint8_t* modifiers)
>+static uint32_t wpeKeySymForKeyRef(WKStringRef keyRef, unsigned location, uint8_t* modifiers)
> {
>     if (location == DOMKeyLocationNumpad) {
>         if (WKStringIsEqualToUTF8CString(keyRef, "leftArrow"))
>-            return XKB_KEY_KP_Left;
>+            return WPE_KEY_KP_Left;
>         if (WKStringIsEqualToUTF8CString(keyRef, "rightArror"))
>-            return XKB_KEY_KP_Right;
>+            return WPE_KEY_KP_Right;
>         if (WKStringIsEqualToUTF8CString(keyRef, "upArrow"))
>-            return XKB_KEY_KP_Up;
>+            return WPE_KEY_KP_Up;
>         if (WKStringIsEqualToUTF8CString(keyRef, "downArrow"))
>-            return XKB_KEY_KP_Down;
>+            return WPE_KEY_KP_Down;
>         if (WKStringIsEqualToUTF8CString(keyRef, "pageUp"))
>-            return XKB_KEY_KP_Page_Up;
>+            return WPE_KEY_KP_Page_Up;
>         if (WKStringIsEqualToUTF8CString(keyRef, "pageDown"))
>-            return XKB_KEY_KP_Page_Down;
>+            return WPE_KEY_KP_Page_Down;
>         if (WKStringIsEqualToUTF8CString(keyRef, "home"))
>-            return XKB_KEY_KP_Home;
>+            return WPE_KEY_KP_Home;
>         if (WKStringIsEqualToUTF8CString(keyRef, "end"))
>-            return XKB_KEY_KP_End;
>+            return WPE_KEY_KP_End;
>         if (WKStringIsEqualToUTF8CString(keyRef, "insert"))
>-            return XKB_KEY_KP_Insert;
>+            return WPE_KEY_KP_Insert;
>         if (WKStringIsEqualToUTF8CString(keyRef, "delete"))
>-            return XKB_KEY_KP_Delete;
>+            return WPE_KEY_KP_Delete;
> 
>-        return XKB_KEY_VoidSymbol;
>+        return WPE_KEY_VoidSymbol;
>     }
> 
>     if (WKStringIsEqualToUTF8CString(keyRef, "leftControl"))
>-        return XKB_KEY_Control_L;
>+        return WPE_KEY_Control_L;
>     if (WKStringIsEqualToUTF8CString(keyRef, "rightControl"))
>-        return XKB_KEY_Control_R;
>+        return WPE_KEY_Control_R;
>     if (WKStringIsEqualToUTF8CString(keyRef, "leftShift"))
>-        return XKB_KEY_Shift_L;
>+        return WPE_KEY_Shift_L;
>     if (WKStringIsEqualToUTF8CString(keyRef, "rightShift"))
>-        return XKB_KEY_Shift_R;
>+        return WPE_KEY_Shift_R;
>     if (WKStringIsEqualToUTF8CString(keyRef, "leftAlt"))
>-        return XKB_KEY_Alt_L;
>+        return WPE_KEY_Alt_L;
>     if (WKStringIsEqualToUTF8CString(keyRef, "rightAlt"))
>-        return XKB_KEY_Alt_R;
>+        return WPE_KEY_Alt_R;
>     if (WKStringIsEqualToUTF8CString(keyRef, "leftArrow"))
>-        return XKB_KEY_Left;
>+        return WPE_KEY_Left;
>     if (WKStringIsEqualToUTF8CString(keyRef, "rightArrow"))
>-        return XKB_KEY_Right;
>+        return WPE_KEY_Right;
>     if (WKStringIsEqualToUTF8CString(keyRef, "upArrow"))
>-        return XKB_KEY_Up;
>+        return WPE_KEY_Up;
>     if (WKStringIsEqualToUTF8CString(keyRef, "downArrow"))
>-        return XKB_KEY_Down;
>+        return WPE_KEY_Down;
>     if (WKStringIsEqualToUTF8CString(keyRef, "pageUp"))
>-        return XKB_KEY_Page_Up;
>+        return WPE_KEY_Page_Up;
>     if (WKStringIsEqualToUTF8CString(keyRef, "pageDown"))
>-        return XKB_KEY_Page_Down;
>+        return WPE_KEY_Page_Down;
>     if (WKStringIsEqualToUTF8CString(keyRef, "home"))
>-        return XKB_KEY_Home;
>+        return WPE_KEY_Home;
>     if (WKStringIsEqualToUTF8CString(keyRef, "end"))
>-        return XKB_KEY_End;
>+        return WPE_KEY_End;
>     if (WKStringIsEqualToUTF8CString(keyRef, "insert"))
>-        return XKB_KEY_Insert;
>+        return WPE_KEY_Insert;
>     if (WKStringIsEqualToUTF8CString(keyRef, "delete"))
>-        return XKB_KEY_Delete;
>+        return WPE_KEY_Delete;
>     if (WKStringIsEqualToUTF8CString(keyRef, "printScreen"))
>-        return XKB_KEY_Print;
>+        return WPE_KEY_Print;
>     if (WKStringIsEqualToUTF8CString(keyRef, "menu"))
>-        return XKB_KEY_Menu;
>+        return WPE_KEY_Menu;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F1"))
>-        return XKB_KEY_F1;
>+        return WPE_KEY_F1;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F2"))
>-        return XKB_KEY_F2;
>+        return WPE_KEY_F2;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F3"))
>-        return XKB_KEY_F3;
>+        return WPE_KEY_F3;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F4"))
>-        return XKB_KEY_F4;
>+        return WPE_KEY_F4;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F5"))
>-        return XKB_KEY_F5;
>+        return WPE_KEY_F5;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F6"))
>-        return XKB_KEY_F6;
>+        return WPE_KEY_F6;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F7"))
>-        return XKB_KEY_F7;
>+        return WPE_KEY_F7;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F8"))
>-        return XKB_KEY_F8;
>+        return WPE_KEY_F8;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F9"))
>-        return XKB_KEY_F9;
>+        return WPE_KEY_F9;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F10"))
>-        return XKB_KEY_F10;
>+        return WPE_KEY_F10;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F11"))
>-        return XKB_KEY_F11;
>+        return WPE_KEY_F11;
>     if (WKStringIsEqualToUTF8CString(keyRef, "F12"))
>-        return XKB_KEY_F12;
>+        return WPE_KEY_F12;
> 
>     size_t bufferSize = WKStringGetMaximumUTF8CStringSize(keyRef);
>     auto buffer = std::make_unique<char[]>(bufferSize);
>@@ -254,27 +252,26 @@ int getXKBKeySymForKeyRef(WKStringRef keyRef, unsigned location, uint8_t* modifi
>     char charCode = buffer.get()[0];
> 
>     if (charCode == '\n' || charCode == '\r')
>-        return XKB_KEY_Return;
>+        return WPE_KEY_Return;
>     if (charCode == '\t')
>-        return XKB_KEY_Tab;
>+        return WPE_KEY_Tab;
>     if (charCode == '\x8')
>-        return XKB_KEY_BackSpace;
>+        return WPE_KEY_BackSpace;
>     if (charCode == 0x001B)
>-        return XKB_KEY_Escape;
>+        return WPE_KEY_Escape;
> 
>     if (WTF::isASCIIUpper(charCode))
>         *modifiers |= wpe_input_keyboard_modifier_shift;
> 
>-    // Not sure if this is correct.
>-    return charCode;
>+    return wpe_unicode_to_key_code(static_cast<uint32_t>(charCode));
> }
> 
> void EventSenderProxy::keyDown(WKStringRef keyRef, WKEventModifiers wkModifiers, unsigned location)
> {
>     uint8_t modifiers = wkEventModifiersToWPE(wkModifiers);
>-    uint32_t keySym = getXKBKeySymForKeyRef(keyRef, location, &modifiers);
>-    uint32_t unicode = xkb_keysym_to_utf32(keySym);
>-    struct wpe_input_keyboard_event event { static_cast<uint32_t>(m_time), keySym, unicode, true, modifiers};
>+    uint32_t keySym = wpeKeySymForKeyRef(keyRef, location, &modifiers);
>+    // FIXME: we don't have a way to get hardware key code in WPE.
>+    struct wpe_input_keyboard_event event { static_cast<uint32_t>(m_time), keySym, 0, true, modifiers};
>     wpe_view_backend_dispatch_keyboard_event(m_viewBackend, &event);
>     event.pressed = false;
>     wpe_view_backend_dispatch_keyboard_event(m_viewBackend, &event);
>diff --git a/Tools/flatpak/org.webkit.WPE.yaml b/Tools/flatpak/org.webkit.WPE.yaml
>index c73cd8d51ac..2bed893eb8f 100644
>--- a/Tools/flatpak/org.webkit.WPE.yaml
>+++ b/Tools/flatpak/org.webkit.WPE.yaml
>@@ -3,13 +3,13 @@
>   sources:
>     - type: git
>       url: https://github.com/WebPlatformForEmbedded/WPEBackend.git
>-      branch: 411decf4875e7a5c858489206cdb7705a4bbb581
>+      branch: 45148ff5e802c6cd1d30d3c318ff6bb5bdf2c4aa
> - name: wpebackend-fdo
>   buildsystem: cmake-ninja
>   sources:
>     - type: git
>       url: https://github.com/Igalia/WPEBackend-fdo.git
>-      branch: da746af2dff6b972c5c4903a132edcafdb768926
>+      branch: fac3fe1ea78b6fc5b6005adfceb93eeb46681485
> - name: lua
>   buildsystem: simple
>   build-commands:
>@@ -40,4 +40,4 @@
> - name: org.webkit.WPE
>   buildsystem: simple
>   build-commands:
>-    - /app/webkit/Tools/Scripts/build-webkit --wpe --prefix=/app
>\ No newline at end of file
>+    - /app/webkit/Tools/Scripts/build-webkit --wpe --prefix=/app
>diff --git a/Tools/wpe/backends/WindowViewBackend.cpp b/Tools/wpe/backends/WindowViewBackend.cpp
>index b29971a9bf8..ef5af4839e9 100644
>--- a/Tools/wpe/backends/WindowViewBackend.cpp
>+++ b/Tools/wpe/backends/WindowViewBackend.cpp
>@@ -651,18 +651,16 @@ void WindowViewBackend::handleKeyEvent(uint32_t key, uint32_t state, uint32_t ti
> {
>     auto& xkb = m_seatData.xkb;
>     uint32_t keysym = xkb_state_key_get_one_sym(xkb.state, key);
>-    uint32_t unicode = xkb_state_key_get_utf32(xkb.state, key);
> 
>     if (xkb.composeState
>         && state == WL_KEYBOARD_KEY_STATE_PRESSED
>         && xkb_compose_state_feed(xkb.composeState, keysym) == XKB_COMPOSE_FEED_ACCEPTED
>         && xkb_compose_state_get_status(xkb.composeState) == XKB_COMPOSE_COMPOSED) {
>         keysym = xkb_compose_state_get_one_sym(xkb.composeState);
>-        unicode = xkb_keysym_to_utf32(keysym);
>     }
> 
>     if (m_seatData.keyboard.target) {
>-        struct wpe_input_keyboard_event event = { time, keysym, unicode, !!state, xkb.modifiers };
>+        struct wpe_input_keyboard_event event = { time, keysym, key, !!state, xkb.modifiers };
>         dispatchInputKeyboardEvent(&event);
>     }
> }
>diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules
>index b1ab4682728..95622928a46 100644
>--- a/Tools/wpe/jhbuild.modules
>+++ b/Tools/wpe/jhbuild.modules
>@@ -167,7 +167,7 @@
> 
>   <cmake id="wpebackend">
>     <branch repo="github.com" module="WebPlatformForEmbedded/WPEBackend.git"
>-            tag="411decf4875e7a5c858489206cdb7705a4bbb581" />
>+            tag="45148ff5e802c6cd1d30d3c318ff6bb5bdf2c4aa" />
>   </cmake>
> 
>   <cmake id="wpebackend-fdo">
>@@ -176,7 +176,7 @@
>       <dep package="glib"/>
>     </dependencies>
>     <branch repo="github.com" module="Igalia/WPEBackend-fdo.git"
>-            tag="da746af2dff6b972c5c4903a132edcafdb768926"/>
>+            tag="fac3fe1ea78b6fc5b6005adfceb93eeb46681485"/>
>   </cmake>
> 
>   <autotools id="libgpg-error" autogen-sh="configure">

Flags:

zan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188093: 345908 | 346463