OLD | NEW |
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/blink/blink_event_util.h" | 9 #include "ui/events/blink/blink_event_util.h" |
10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 #if defined(USE_X11) | 108 #if defined(USE_X11) |
109 ui::ScopedXI2Event xev; | 109 ui::ScopedXI2Event xev; |
110 { | 110 { |
111 // Press left Ctrl. | 111 // Press left Ctrl. |
112 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); | 112 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); |
113 XEvent* xevent = xev; | 113 XEvent* xevent = xev; |
114 xevent->xkey.keycode = | 114 xevent->xkey.keycode = |
115 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT); | 115 ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT); |
116 ui::KeyEvent event(xev); | 116 ui::KeyEvent event(xev); |
117 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); | 117 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); |
118 // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled. | 118 EXPECT_EQ(ui::VKEY_CONTROL, webkit_event.windowsKeyCode); |
119 EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode); | |
120 } | 119 } |
121 { | 120 { |
122 // Press right Ctrl. | 121 // Press right Ctrl. |
123 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); | 122 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); |
124 XEvent* xevent = xev; | 123 XEvent* xevent = xev; |
125 xevent->xkey.keycode = ui::KeycodeConverter::DomCodeToNativeKeycode( | 124 xevent->xkey.keycode = ui::KeycodeConverter::DomCodeToNativeKeycode( |
126 ui::DomCode::CONTROL_RIGHT); | 125 ui::DomCode::CONTROL_RIGHT); |
127 ui::KeyEvent event(xev); | 126 ui::KeyEvent event(xev); |
128 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); | 127 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); |
129 // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled. | 128 EXPECT_EQ(ui::VKEY_CONTROL, webkit_event.windowsKeyCode); |
130 EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode); | |
131 } | 129 } |
132 #elif defined(OS_WIN) | 130 #elif defined(OS_WIN) |
133 // TODO(yusukes): Add tests for win_aura once keyboardEvent() in | 131 // TODO(yusukes): Add tests for win_aura once keyboardEvent() in |
134 // third_party/WebKit/Source/web/win/WebInputEventFactory.cpp is modified | 132 // third_party/WebKit/Source/web/win/WebInputEventFactory.cpp is modified |
135 // to return VKEY_[LR]XXX instead of VKEY_XXX. | 133 // to return VKEY_[LR]XXX instead of VKEY_XXX. |
136 // https://bugs.webkit.org/show_bug.cgi?id=86694 | 134 // https://bugs.webkit.org/show_bug.cgi?id=86694 |
137 #endif | 135 #endif |
138 { | 136 { |
139 // Press left Ctrl. | 137 // Press left Ctrl. |
140 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, | 138 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, |
141 ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN, | 139 ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN, |
142 ui::DomKey::CONTROL, ui::EventTimeForNow()); | 140 ui::DomKey::CONTROL, ui::EventTimeForNow()); |
143 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); | 141 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); |
144 // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled. | 142 EXPECT_EQ(ui::VKEY_CONTROL, webkit_event.windowsKeyCode); |
145 EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode); | |
146 } | 143 } |
147 { | 144 { |
148 // Press right Ctrl. | 145 // Press right Ctrl. |
149 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, | 146 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, |
150 ui::DomCode::CONTROL_RIGHT, ui::EF_CONTROL_DOWN, | 147 ui::DomCode::CONTROL_RIGHT, ui::EF_CONTROL_DOWN, |
151 ui::DomKey::CONTROL, ui::EventTimeForNow()); | 148 ui::DomKey::CONTROL, ui::EventTimeForNow()); |
152 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); | 149 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); |
153 // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled. | 150 EXPECT_EQ(ui::VKEY_CONTROL, webkit_event.windowsKeyCode); |
154 EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode); | |
155 } | 151 } |
156 } | 152 } |
157 | 153 |
158 // Checks that MakeWebKeyboardEvent fills a correct keypad modifier. | 154 // Checks that MakeWebKeyboardEvent fills a correct keypad modifier. |
159 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventKeyPadKeyCode) { | 155 TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventKeyPadKeyCode) { |
160 #if defined(USE_X11) | 156 #if defined(USE_X11) |
161 #define XK(x) XK_##x | 157 #define XK(x) XK_##x |
162 #else | 158 #else |
163 #define XK(x) 0 | 159 #define XK(x) 0 |
164 #endif | 160 #endif |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
510 EXPECT_EQ(0, webkit_event.tiltY); | 506 EXPECT_EQ(0, webkit_event.tiltY); |
511 EXPECT_FLOAT_EQ(0.0f, webkit_event.force); | 507 EXPECT_FLOAT_EQ(0.0f, webkit_event.force); |
512 EXPECT_EQ(123, webkit_event.x); | 508 EXPECT_EQ(123, webkit_event.x); |
513 EXPECT_EQ(123, webkit_event.windowX); | 509 EXPECT_EQ(123, webkit_event.windowX); |
514 EXPECT_EQ(321, webkit_event.y); | 510 EXPECT_EQ(321, webkit_event.y); |
515 EXPECT_EQ(321, webkit_event.windowY); | 511 EXPECT_EQ(321, webkit_event.windowY); |
516 } | 512 } |
517 } | 513 } |
518 | 514 |
519 } // namespace content | 515 } // namespace content |
OLD | NEW |