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/event.h" | 9 #include "ui/events/event.h" |
10 #include "ui/events/event_utils.h" | 10 #include "ui/events/event_utils.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 { | 27 { |
28 // Press Ctrl. | 28 // Press Ctrl. |
29 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, | 29 ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, |
30 ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN); | 30 ui::DomCode::CONTROL_LEFT, ui::EF_CONTROL_DOWN); |
31 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); | 31 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); |
32 // However, modifier bit for Control in |webkit_event| should be set. | 32 // However, modifier bit for Control in |webkit_event| should be set. |
33 EXPECT_EQ(blink::WebInputEvent::ControlKey | blink::WebInputEvent::IsLeft, | 33 EXPECT_EQ(blink::WebInputEvent::ControlKey | blink::WebInputEvent::IsLeft, |
34 webkit_event.modifiers); | 34 webkit_event.modifiers); |
35 EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT), | 35 EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT), |
36 webkit_event.domCode); | 36 webkit_event.domCode); |
| 37 EXPECT_EQ(static_cast<int>(ui::DomKey::CONTROL), |
| 38 webkit_event.domKey); |
37 } | 39 } |
38 { | 40 { |
39 // Release Ctrl. | 41 // Release Ctrl. |
40 ui::KeyEvent event(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, | 42 ui::KeyEvent event(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, |
41 ui::DomCode::CONTROL_LEFT, ui::EF_NONE); | 43 ui::DomCode::CONTROL_LEFT, ui::EF_NONE); |
42 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); | 44 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); |
43 // However, modifier bit for Control in |webkit_event| shouldn't be set. | 45 // However, modifier bit for Control in |webkit_event| shouldn't be set. |
44 EXPECT_EQ(blink::WebInputEvent::IsLeft, webkit_event.modifiers); | 46 EXPECT_EQ(blink::WebInputEvent::IsLeft, webkit_event.modifiers); |
45 EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT), | 47 EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT), |
46 webkit_event.domCode); | 48 webkit_event.domCode); |
| 49 EXPECT_EQ(static_cast<int>(ui::DomKey::CONTROL), |
| 50 webkit_event.domKey); |
| 51 |
47 } | 52 } |
48 #if defined(USE_X11) | 53 #if defined(USE_X11) |
49 const int kLocationModifiers = | 54 const int kLocationModifiers = |
50 blink::WebInputEvent::IsLeft | blink::WebInputEvent::IsRight; | 55 blink::WebInputEvent::IsLeft | blink::WebInputEvent::IsRight; |
51 ui::ScopedXI2Event xev; | 56 ui::ScopedXI2Event xev; |
52 { | 57 { |
53 // Press Ctrl. | 58 // Press Ctrl. |
54 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); | 59 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); |
55 ui::KeyEvent event(xev); | 60 ui::KeyEvent event(xev); |
56 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); | 61 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 << "{dom_code:" | 224 << "{dom_code:" |
220 << ui::KeycodeConverter::DomCodeToCodeString(test_case.dom_code) | 225 << ui::KeycodeConverter::DomCodeToCodeString(test_case.dom_code) |
221 << ", ui_keycode:" << test_case.ui_keycode | 226 << ", ui_keycode:" << test_case.ui_keycode |
222 << ", x_keysym:" << test_case.x_keysym | 227 << ", x_keysym:" << test_case.x_keysym |
223 << "}, expect: " << test_case.expected_result; | 228 << "}, expect: " << test_case.expected_result; |
224 } | 229 } |
225 #endif | 230 #endif |
226 } | 231 } |
227 | 232 |
228 } // namespace content | 233 } // namespace content |
OLD | NEW |