diff options
Diffstat (limited to 'ui/events/x')
| -rw-r--r-- | ui/events/x/events_x.cc | 4 | ||||
| -rw-r--r-- | ui/events/x/events_x_unittest.cc | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc index 57198c0..fb6bed8 100644 --- a/ui/events/x/events_x.cc +++ b/ui/events/x/events_x.cc @@ -622,6 +622,10 @@ uint32 PlatformKeycodeFromNative(const base::NativeEvent& native_event) { return keysym; } +bool IsCharFromNative(const base::NativeEvent& native_event) { + return false; +} + int GetChangedMouseButtonFlagsFromNative( const base::NativeEvent& native_event) { switch (native_event->type) { diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc index bb03177..096ee95 100644 --- a/ui/events/x/events_x_unittest.cc +++ b/ui/events/x/events_x_unittest.cc @@ -19,6 +19,7 @@ #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/events/event_utils.h" +#include "ui/events/test/events_test_utils.h" #include "ui/events/test/events_test_utils_x11.h" #include "ui/events/x/device_data_manager_x11.h" #include "ui/events/x/touch_factory_x11.h" @@ -71,7 +72,7 @@ bool HasFunctionKeyFlagSetIfSupported(Display* display, int x_keysym) { // Exclude keysyms for which the server has no corresponding keycode. if (x_keycode) { InitKeyEvent(display, &event, true, x_keycode, 0); - ui::KeyEvent ui_key_event(&event, false); + ui::KeyEvent ui_key_event(&event); return (ui_key_event.flags() & ui::EF_FUNCTION_KEY); } return true; @@ -454,7 +455,7 @@ TEST_F(EventsXTest, NumpadKeyEvents) { InitKeyEvent(display, &event, true, x_keycode, 0); // int keysym = XLookupKeysym(&event.xkey, 0); // if (keysym) { - ui::KeyEvent ui_key_event(&event, false); + ui::KeyEvent ui_key_event(&event); EXPECT_EQ(keys[k].is_numpad_key ? ui::EF_NUMPAD_KEY : 0, ui_key_event.flags() & ui::EF_NUMPAD_KEY); } @@ -578,7 +579,11 @@ TEST_F(EventsXTest, ImeFabricatedKeyEvents) { for (int is_char = 0; is_char < 2; ++is_char) { XEvent x_event; InitKeyEvent(display, &x_event, true, 0, state); - ui::KeyEvent key_event(&x_event, is_char); + ui::KeyEvent key_event(&x_event); + if (is_char) { + KeyEventTestApi test_event(&key_event); + test_event.set_is_char(true); + } EXPECT_TRUE(key_event.flags() & ui::EF_IME_FABRICATED_KEY); } } @@ -591,7 +596,11 @@ TEST_F(EventsXTest, ImeFabricatedKeyEvents) { for (int is_char = 0; is_char < 2; ++is_char) { XEvent x_event; InitKeyEvent(display, &x_event, true, 0, state); - ui::KeyEvent key_event(&x_event, is_char); + ui::KeyEvent key_event(&x_event); + if (is_char) { + KeyEventTestApi test_event(&key_event); + test_event.set_is_char(true); + } EXPECT_FALSE(key_event.flags() & ui::EF_IME_FABRICATED_KEY); } } |