Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1264)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/web_input_event_aura_unittest.cc

Issue 1135083004: Revert of Remove EF_FUNCTION_KEY and EF_NUMPAD_KEY. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | ui/events/blink/blink_event_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/web_input_event_aura_unittest.cc
diff --git a/content/browser/renderer_host/web_input_event_aura_unittest.cc b/content/browser/renderer_host/web_input_event_aura_unittest.cc
index 43fe2179c1effd73f0dffec8ed3245c3cc7787af..6d4e3aa5bff663415324bff0e2d8809d93cb8905 100644
--- a/content/browser/renderer_host/web_input_event_aura_unittest.cc
+++ b/content/browser/renderer_host/web_input_event_aura_unittest.cc
@@ -24,26 +24,7 @@
// Checks that MakeWebKeyboardEvent makes a DOM3 spec compliant key event.
// crbug.com/127142
TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) {
- {
- // Press Ctrl.
- ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL,
- ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN);
- blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
- // However, modifier bit for Control in |webkit_event| should be set.
- EXPECT_EQ(blink::WebInputEvent::ControlKey | blink::WebInputEvent::IsLeft,
- webkit_event.modifiers);
- }
- {
- // Release Ctrl.
- ui::KeyEvent event(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL,
- ui::DomCode::CONTROL_LEFT, ui::EF_NONE);
- 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);
- }
#if defined(USE_X11)
- const int kLocationModifiers =
- blink::WebInputEvent::IsLeft | blink::WebInputEvent::IsRight;
ui::ScopedXI2Event xev;
{
// Press Ctrl.
@@ -51,8 +32,7 @@
ui::KeyEvent event(xev);
blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
// However, modifier bit for Control in |webkit_event| should be set.
- EXPECT_EQ(blink::WebInputEvent::ControlKey,
- webkit_event.modifiers & ~kLocationModifiers);
+ EXPECT_EQ(webkit_event.modifiers, blink::WebInputEvent::ControlKey);
}
{
// Release Ctrl.
@@ -60,7 +40,7 @@
ui::KeyEvent event(xev);
blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
// However, modifier bit for Control in |webkit_event| shouldn't be set.
- EXPECT_EQ(0, webkit_event.modifiers & ~kLocationModifiers);
+ EXPECT_EQ(webkit_event.modifiers, 0);
}
#endif
}
@@ -82,8 +62,8 @@
// Press left Ctrl.
xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0);
XEvent* xevent = xev;
- xevent->xkey.keycode =
- ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT);
+ xevent->xkey.keycode = ui::KeycodeConverter::DomCodeToNativeKeycode(
+ ui::DomCode::CONTROL_LEFT);
ui::KeyEvent event(xev);
blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
// ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled.
@@ -126,88 +106,68 @@
}
}
-// Checks that MakeWebKeyboardEvent fills a correct keypad modifier.
+// Checks that MakeWebKeyboardEvent fills a correct keypard modifier.
TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventKeyPadKeyCode) {
#if defined(USE_X11)
-#define XK(x) XK_##x
-#else
-#define XK(x) 0
-#endif
struct TestCase {
- ui::DomCode dom_code; // The physical key (location).
ui::KeyboardCode ui_keycode; // The virtual key code.
- uint32 x_keysym; // The X11 keysym.
- bool expected_result; // true if the event has "isKeyPad" modifier.
+ uint32 x_keycode; // The platform key code.
+ bool expected_result; // true if the event has "isKeyPad" modifier.
} kTesCases[] = {
- {ui::DomCode::DIGIT0, ui::VKEY_0, XK(0), false},
- {ui::DomCode::DIGIT1, ui::VKEY_1, XK(1), false},
- {ui::DomCode::DIGIT2, ui::VKEY_2, XK(2), false},
- {ui::DomCode::DIGIT3, ui::VKEY_3, XK(3), false},
- {ui::DomCode::DIGIT4, ui::VKEY_4, XK(4), false},
- {ui::DomCode::DIGIT5, ui::VKEY_5, XK(5), false},
- {ui::DomCode::DIGIT6, ui::VKEY_6, XK(6), false},
- {ui::DomCode::DIGIT7, ui::VKEY_7, XK(7), false},
- {ui::DomCode::DIGIT8, ui::VKEY_8, XK(8), false},
- {ui::DomCode::DIGIT9, ui::VKEY_9, XK(9), false},
+ {ui::VKEY_0, XK_0, false},
+ {ui::VKEY_1, XK_1, false},
+ {ui::VKEY_2, XK_2, false},
+ {ui::VKEY_3, XK_3, false},
+ {ui::VKEY_4, XK_4, false},
+ {ui::VKEY_5, XK_5, false},
+ {ui::VKEY_6, XK_6, false},
+ {ui::VKEY_7, XK_7, false},
+ {ui::VKEY_8, XK_8, false},
+ {ui::VKEY_9, XK_9, false},
- {ui::DomCode::NUMPAD0, ui::VKEY_NUMPAD0, XK(KP_0), true},
- {ui::DomCode::NUMPAD1, ui::VKEY_NUMPAD1, XK(KP_1), true},
- {ui::DomCode::NUMPAD2, ui::VKEY_NUMPAD2, XK(KP_2), true},
- {ui::DomCode::NUMPAD3, ui::VKEY_NUMPAD3, XK(KP_3), true},
- {ui::DomCode::NUMPAD4, ui::VKEY_NUMPAD4, XK(KP_4), true},
- {ui::DomCode::NUMPAD5, ui::VKEY_NUMPAD5, XK(KP_5), true},
- {ui::DomCode::NUMPAD6, ui::VKEY_NUMPAD6, XK(KP_6), true},
- {ui::DomCode::NUMPAD7, ui::VKEY_NUMPAD7, XK(KP_7), true},
- {ui::DomCode::NUMPAD8, ui::VKEY_NUMPAD8, XK(KP_8), true},
- {ui::DomCode::NUMPAD9, ui::VKEY_NUMPAD9, XK(KP_9), true},
+ {ui::VKEY_NUMPAD0, XK_KP_0, true},
+ {ui::VKEY_NUMPAD1, XK_KP_1, true},
+ {ui::VKEY_NUMPAD2, XK_KP_2, true},
+ {ui::VKEY_NUMPAD3, XK_KP_3, true},
+ {ui::VKEY_NUMPAD4, XK_KP_4, true},
+ {ui::VKEY_NUMPAD5, XK_KP_5, true},
+ {ui::VKEY_NUMPAD6, XK_KP_6, true},
+ {ui::VKEY_NUMPAD7, XK_KP_7, true},
+ {ui::VKEY_NUMPAD8, XK_KP_8, true},
+ {ui::VKEY_NUMPAD9, XK_KP_9, true},
- {ui::DomCode::NUMPAD_MULTIPLY, ui::VKEY_MULTIPLY, XK(KP_Multiply), true},
- {ui::DomCode::NUMPAD_SUBTRACT, ui::VKEY_SUBTRACT, XK(KP_Subtract), true},
- {ui::DomCode::NUMPAD_ADD, ui::VKEY_ADD, XK(KP_Add), true},
- {ui::DomCode::NUMPAD_DIVIDE, ui::VKEY_DIVIDE, XK(KP_Divide), true},
- {ui::DomCode::NUMPAD_DECIMAL, ui::VKEY_DECIMAL, XK(KP_Decimal), true},
- {ui::DomCode::NUMPAD_DECIMAL, ui::VKEY_DELETE, XK(KP_Delete), true},
- {ui::DomCode::NUMPAD0, ui::VKEY_INSERT, XK(KP_Insert), true},
- {ui::DomCode::NUMPAD1, ui::VKEY_END, XK(KP_End), true},
- {ui::DomCode::NUMPAD2, ui::VKEY_DOWN, XK(KP_Down), true},
- {ui::DomCode::NUMPAD3, ui::VKEY_NEXT, XK(KP_Page_Down), true},
- {ui::DomCode::NUMPAD4, ui::VKEY_LEFT, XK(KP_Left), true},
- {ui::DomCode::NUMPAD5, ui::VKEY_CLEAR, XK(KP_Begin), true},
- {ui::DomCode::NUMPAD6, ui::VKEY_RIGHT, XK(KP_Right), true},
- {ui::DomCode::NUMPAD7, ui::VKEY_HOME, XK(KP_Home), true},
- {ui::DomCode::NUMPAD8, ui::VKEY_UP, XK(KP_Up), true},
- {ui::DomCode::NUMPAD9, ui::VKEY_PRIOR, XK(KP_Page_Up), true},
+ {ui::VKEY_MULTIPLY, XK_KP_Multiply, true},
+ {ui::VKEY_SUBTRACT, XK_KP_Subtract, true},
+ {ui::VKEY_ADD, XK_KP_Add, true},
+ {ui::VKEY_DIVIDE, XK_KP_Divide, true},
+ {ui::VKEY_DECIMAL, XK_KP_Decimal, true},
+ {ui::VKEY_DELETE, XK_KP_Delete, true},
+ {ui::VKEY_INSERT, XK_KP_Insert, true},
+ {ui::VKEY_END, XK_KP_End, true},
+ {ui::VKEY_DOWN, XK_KP_Down, true},
+ {ui::VKEY_NEXT, XK_KP_Page_Down, true},
+ {ui::VKEY_LEFT, XK_KP_Left, true},
+ {ui::VKEY_CLEAR, XK_KP_Begin, true},
+ {ui::VKEY_RIGHT, XK_KP_Right, true},
+ {ui::VKEY_HOME, XK_KP_Home, true},
+ {ui::VKEY_UP, XK_KP_Up, true},
+ {ui::VKEY_PRIOR, XK_KP_Page_Up, true},
};
- for (const auto& test_case : kTesCases) {
- ui::KeyEvent event(ui::ET_KEY_PRESSED, test_case.ui_keycode,
- test_case.dom_code, ui::EF_NONE);
- blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
- EXPECT_EQ(test_case.expected_result,
- (webkit_event.modifiers & blink::WebInputEvent::IsKeyPad) != 0)
- << "Failed in "
- << "{dom_code:"
- << ui::KeycodeConverter::DomCodeToCodeString(test_case.dom_code)
- << ", ui_keycode:" << test_case.ui_keycode
- << "}, expect: " << test_case.expected_result;
- }
-#if defined(USE_X11)
ui::ScopedXI2Event xev;
for (size_t i = 0; i < arraysize(kTesCases); ++i) {
const TestCase& test_case = kTesCases[i];
- xev.InitKeyEvent(ui::ET_KEY_PRESSED, test_case.ui_keycode, ui::EF_NONE);
+ xev.InitKeyEvent(ui::ET_KEY_PRESSED, test_case.ui_keycode, 0);
XEvent* xevent = xev;
- xevent->xkey.keycode =
- XKeysymToKeycode(gfx::GetXDisplay(), test_case.x_keysym);
+ xevent->xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(),
+ test_case.x_keycode);
ui::KeyEvent event(xev);
blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
EXPECT_EQ(test_case.expected_result,
(webkit_event.modifiers & blink::WebInputEvent::IsKeyPad) != 0)
<< "Failed in " << i << "th test case: "
- << "{dom_code:"
- << ui::KeycodeConverter::DomCodeToCodeString(test_case.dom_code)
- << ", ui_keycode:" << test_case.ui_keycode
- << ", x_keysym:" << test_case.x_keysym
+ << "{ui_keycode:" << test_case.ui_keycode
+ << ", x_keycode:" << test_case.x_keycode
<< "}, expect: " << test_case.expected_result;
}
#endif
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | ui/events/blink/blink_event_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698