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

Side by Side Diff: content/browser/renderer_host/web_input_event_aura_unittest.cc

Issue 404203003: Distinguish between keystroke and character events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IsCharFromNative() for Mac build Created 6 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/web_input_event_aura.h" 5 #include "content/browser/renderer_host/web_input_event_aura.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 10
11 #if defined(USE_X11) 11 #if defined(USE_X11)
12 #include <X11/keysym.h> 12 #include <X11/keysym.h>
13 #include <X11/Xlib.h> 13 #include <X11/Xlib.h>
14 #include "ui/events/test/events_test_utils_x11.h" 14 #include "ui/events/test/events_test_utils_x11.h"
15 #include "ui/gfx/x/x11_types.h" 15 #include "ui/gfx/x/x11_types.h"
16 #endif 16 #endif
17 17
18 namespace content { 18 namespace content {
19 19
20 // Checks that MakeWebKeyboardEvent makes a DOM3 spec compliant key event. 20 // Checks that MakeWebKeyboardEvent makes a DOM3 spec compliant key event.
21 // crbug.com/127142 21 // crbug.com/127142
22 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) { 22 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) {
23 #if defined(USE_X11) 23 #if defined(USE_X11)
24 ui::ScopedXI2Event xev; 24 ui::ScopedXI2Event xev;
25 { 25 {
26 // Press Ctrl. 26 // Press Ctrl.
27 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); 27 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0);
28 ui::KeyEvent event(xev, false /* is_char */); 28 ui::KeyEvent event(xev);
29 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 29 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
30 // However, modifier bit for Control in |webkit_event| should be set. 30 // However, modifier bit for Control in |webkit_event| should be set.
31 EXPECT_EQ(webkit_event.modifiers, blink::WebInputEvent::ControlKey); 31 EXPECT_EQ(webkit_event.modifiers, blink::WebInputEvent::ControlKey);
32 } 32 }
33 { 33 {
34 // Release Ctrl. 34 // Release Ctrl.
35 xev.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, ControlMask); 35 xev.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, ControlMask);
36 ui::KeyEvent event(xev, false /* is_char */); 36 ui::KeyEvent event(xev);
37 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 37 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
38 // However, modifier bit for Control in |webkit_event| shouldn't be set. 38 // However, modifier bit for Control in |webkit_event| shouldn't be set.
39 EXPECT_EQ(webkit_event.modifiers, 0); 39 EXPECT_EQ(webkit_event.modifiers, 0);
40 } 40 }
41 #endif 41 #endif
42 } 42 }
43 43
44 // Checks that MakeWebKeyboardEvent returns a correct windowsKeyCode. 44 // Checks that MakeWebKeyboardEvent returns a correct windowsKeyCode.
45 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) { 45 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) {
46 #if defined(USE_X11) 46 #if defined(USE_X11)
47 ui::ScopedXI2Event xev; 47 ui::ScopedXI2Event xev;
48 { 48 {
49 // Press left Ctrl. 49 // Press left Ctrl.
50 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); 50 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0);
51 XEvent* xevent = xev; 51 XEvent* xevent = xev;
52 xevent->xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_L); 52 xevent->xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_L);
53 ui::KeyEvent event(xev, false /* is_char */); 53 ui::KeyEvent event(xev);
54 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 54 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
55 // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled. 55 // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled.
56 EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode); 56 EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode);
57 } 57 }
58 { 58 {
59 // Press right Ctrl. 59 // Press right Ctrl.
60 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); 60 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0);
61 XEvent* xevent = xev; 61 XEvent* xevent = xev;
62 xevent->xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_R); 62 xevent->xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_R);
63 ui::KeyEvent event(xev, false /* is_char */); 63 ui::KeyEvent event(xev);
64 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 64 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
65 // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled. 65 // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled.
66 EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode); 66 EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode);
67 } 67 }
68 #elif defined(OS_WIN) 68 #elif defined(OS_WIN)
69 // TODO(yusukes): Add tests for win_aura once keyboardEvent() in 69 // TODO(yusukes): Add tests for win_aura once keyboardEvent() in
70 // third_party/WebKit/Source/web/win/WebInputEventFactory.cpp is modified 70 // third_party/WebKit/Source/web/win/WebInputEventFactory.cpp is modified
71 // to return VKEY_[LR]XXX instead of VKEY_XXX. 71 // to return VKEY_[LR]XXX instead of VKEY_XXX.
72 // https://bugs.webkit.org/show_bug.cgi?id=86694 72 // https://bugs.webkit.org/show_bug.cgi?id=86694
73 #endif 73 #endif
74 } 74 }
75 75
76 } // namespace content 76 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698