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

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

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
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
(...skipping 11 matching lines...) Expand all
22 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) { 22 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) {
23 #if defined(USE_X11) 23 #if defined(USE_X11)
24 XEvent xev; 24 XEvent xev;
25 { 25 {
26 // Press Ctrl. 26 // Press Ctrl.
27 ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED, 27 ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
28 ui::VKEY_CONTROL, 28 ui::VKEY_CONTROL,
29 0, // X does not set ControlMask for KeyPress. 29 0, // X does not set ControlMask for KeyPress.
30 &xev); 30 &xev);
31 ui::KeyEvent event(&xev, false /* is_char */); 31 ui::KeyEvent event(&xev, false /* is_char */);
32 WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 32 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
33 // However, modifier bit for Control in |webkit_event| should be set. 33 // However, modifier bit for Control in |webkit_event| should be set.
34 EXPECT_EQ(webkit_event.modifiers, WebKit::WebInputEvent::ControlKey); 34 EXPECT_EQ(webkit_event.modifiers, blink::WebInputEvent::ControlKey);
35 } 35 }
36 { 36 {
37 // Release Ctrl. 37 // Release Ctrl.
38 ui::InitXKeyEventForTesting(ui::ET_KEY_RELEASED, 38 ui::InitXKeyEventForTesting(ui::ET_KEY_RELEASED,
39 ui::VKEY_CONTROL, 39 ui::VKEY_CONTROL,
40 ControlMask, // X sets the mask for KeyRelease. 40 ControlMask, // X sets the mask for KeyRelease.
41 &xev); 41 &xev);
42 ui::KeyEvent event(&xev, false /* is_char */); 42 ui::KeyEvent event(&xev, false /* is_char */);
43 WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 43 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
44 // However, modifier bit for Control in |webkit_event| shouldn't be set. 44 // However, modifier bit for Control in |webkit_event| shouldn't be set.
45 EXPECT_EQ(webkit_event.modifiers, 0); 45 EXPECT_EQ(webkit_event.modifiers, 0);
46 } 46 }
47 #endif 47 #endif
48 } 48 }
49 49
50 // Checks that MakeWebKeyboardEvent returns a correct windowsKeyCode. 50 // Checks that MakeWebKeyboardEvent returns a correct windowsKeyCode.
51 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) { 51 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) {
52 #if defined(USE_X11) 52 #if defined(USE_X11)
53 XEvent xev; 53 XEvent xev;
54 { 54 {
55 // Press left Ctrl. 55 // Press left Ctrl.
56 ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED, 56 ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
57 ui::VKEY_CONTROL, 57 ui::VKEY_CONTROL,
58 0, // X does not set ControlMask for KeyPress. 58 0, // X does not set ControlMask for KeyPress.
59 &xev); 59 &xev);
60 xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_L); 60 xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_L);
61 ui::KeyEvent event(&xev, false /* is_char */); 61 ui::KeyEvent event(&xev, false /* is_char */);
62 WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 62 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
63 // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled. 63 // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled.
64 EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode); 64 EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode);
65 } 65 }
66 { 66 {
67 // Press right Ctrl. 67 // Press right Ctrl.
68 ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED, 68 ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
69 ui::VKEY_CONTROL, 69 ui::VKEY_CONTROL,
70 0, // X does not set ControlMask for KeyPress. 70 0, // X does not set ControlMask for KeyPress.
71 &xev); 71 &xev);
72 xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_R); 72 xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_R);
73 ui::KeyEvent event(&xev, false /* is_char */); 73 ui::KeyEvent event(&xev, false /* is_char */);
74 WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); 74 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event);
75 // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled. 75 // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled.
76 EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode); 76 EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode);
77 } 77 }
78 #elif defined(OS_WIN) 78 #elif defined(OS_WIN)
79 // TODO(yusukes): Add tests for win_aura once keyboardEvent() in 79 // TODO(yusukes): Add tests for win_aura once keyboardEvent() in
80 // third_party/WebKit/Source/web/win/WebInputEventFactory.cpp is modified 80 // third_party/WebKit/Source/web/win/WebInputEventFactory.cpp is modified
81 // to return VKEY_[LR]XXX instead of VKEY_XXX. 81 // to return VKEY_[LR]XXX instead of VKEY_XXX.
82 // https://bugs.webkit.org/show_bug.cgi?id=86694 82 // https://bugs.webkit.org/show_bug.cgi?id=86694
83 #endif 83 #endif
84 } 84 }
85 85
86 } // namespace content 86 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | content/browser/renderer_host/web_input_event_aurawin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698