Commit 81c9cea9 authored by kpschoedel's avatar kpschoedel Committed by Commit bot

Set WebKeyboardEvent.domCode on Windows.

BUG=489446

Review URL: https://codereview.chromium.org/1147843003

Cr-Commit-Position: refs/heads/master@{#330586}
parent 33d24423
......@@ -273,7 +273,10 @@ blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent& event) {
#if defined(OS_WIN)
if (event.HasNativeEvent()) {
// Key events require no translation by the aura system.
return MakeWebKeyboardEventFromNativeEvent(event.native_event());
blink::WebKeyboardEvent webkit_event(
MakeWebKeyboardEventFromNativeEvent(event.native_event()));
webkit_event.domCode = static_cast<int>(event.code());
return webkit_event;
}
#endif
return MakeWebKeyboardEventFromAuraEvent(event);
......
......@@ -32,6 +32,8 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) {
// However, modifier bit for Control in |webkit_event| should be set.
EXPECT_EQ(blink::WebInputEvent::ControlKey | blink::WebInputEvent::IsLeft,
webkit_event.modifiers);
EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT),
webkit_event.domCode);
}
{
// Release Ctrl.
......@@ -40,6 +42,8 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) {
blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
// However, modifier bit for Control in |webkit_event| shouldn't be set.
EXPECT_EQ(blink::WebInputEvent::IsLeft, webkit_event.modifiers);
EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT),
webkit_event.domCode);
}
#if defined(USE_X11)
const int kLocationModifiers =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment