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

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

Issue 1214823002: Revert of [KeyboardEvent] Add embedder APIs to translate between Dom |key| enum and strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 #include "ui/events/event_utils.h" 10 #include "ui/events/event_utils.h"
(...skipping 16 matching lines...) Expand all
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);
39 } 37 }
40 { 38 {
41 // Release Ctrl. 39 // Release Ctrl.
42 ui::KeyEvent event(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, 40 ui::KeyEvent event(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL,
43 ui::DomCode::CONTROL_LEFT, ui::EF_NONE); 41 ui::DomCode::CONTROL_LEFT, ui::EF_NONE);
44 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); 42 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
45 // However, modifier bit for Control in |webkit_event| shouldn't be set. 43 // However, modifier bit for Control in |webkit_event| shouldn't be set.
46 EXPECT_EQ(blink::WebInputEvent::IsLeft, webkit_event.modifiers); 44 EXPECT_EQ(blink::WebInputEvent::IsLeft, webkit_event.modifiers);
47 EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT), 45 EXPECT_EQ(static_cast<int>(ui::DomCode::CONTROL_LEFT),
48 webkit_event.domCode); 46 webkit_event.domCode);
49 EXPECT_EQ(static_cast<int>(ui::DomKey::CONTROL),
50 webkit_event.domKey);
51
52 } 47 }
53 #if defined(USE_X11) 48 #if defined(USE_X11)
54 const int kLocationModifiers = 49 const int kLocationModifiers =
55 blink::WebInputEvent::IsLeft | blink::WebInputEvent::IsRight; 50 blink::WebInputEvent::IsLeft | blink::WebInputEvent::IsRight;
56 ui::ScopedXI2Event xev; 51 ui::ScopedXI2Event xev;
57 { 52 {
58 // Press Ctrl. 53 // Press Ctrl.
59 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0); 54 xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0);
60 ui::KeyEvent event(xev); 55 ui::KeyEvent event(xev);
61 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); 56 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 << "{dom_code:" 219 << "{dom_code:"
225 << ui::KeycodeConverter::DomCodeToCodeString(test_case.dom_code) 220 << ui::KeycodeConverter::DomCodeToCodeString(test_case.dom_code)
226 << ", ui_keycode:" << test_case.ui_keycode 221 << ", ui_keycode:" << test_case.ui_keycode
227 << ", x_keysym:" << test_case.x_keysym 222 << ", x_keysym:" << test_case.x_keysym
228 << "}, expect: " << test_case.expected_result; 223 << "}, expect: " << test_case.expected_result;
229 } 224 }
230 #endif 225 #endif
231 } 226 }
232 227
233 } // namespace content 228 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | content/child/blink_platform_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698