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 "content/browser/renderer_host/input/web_input_event_util.h" | 7 #include "content/browser/renderer_host/input/web_input_event_util.h" |
8 #include "content/browser/renderer_host/ui_events_helper.h" | 8 #include "content/browser/renderer_host/ui_events_helper.h" |
9 #include "ui/aura/client/screen_position_client.h" | 9 #include "ui/aura/client/screen_position_client.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
11 #include "ui/events/blink/blink_event_util.h" | 11 #include "ui/events/blink/blink_event_util.h" |
12 #include "ui/events/event.h" | 12 #include "ui/events/event.h" |
13 #include "ui/events/event_utils.h" | 13 #include "ui/events/event_utils.h" |
14 #include "ui/events/keycodes/dom/dom_key.h" | |
14 #include "ui/events/keycodes/dom/keycode_converter.h" | 15 #include "ui/events/keycodes/dom/keycode_converter.h" |
15 | 16 |
16 namespace content { | 17 namespace content { |
17 | 18 |
18 namespace { | 19 namespace { |
19 | 20 |
20 gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) { | 21 gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) { |
21 if (!event.target()) | 22 if (!event.target()) |
22 return event.root_location(); | 23 return event.root_location(); |
23 | 24 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 NOTREACHED(); | 79 NOTREACHED(); |
79 } | 80 } |
80 | 81 |
81 if (webkit_event.modifiers & blink::WebInputEvent::AltKey) | 82 if (webkit_event.modifiers & blink::WebInputEvent::AltKey) |
82 webkit_event.isSystemKey = true; | 83 webkit_event.isSystemKey = true; |
83 | 84 |
84 webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode(); | 85 webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode(); |
85 webkit_event.nativeKeyCode = | 86 webkit_event.nativeKeyCode = |
86 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code()); | 87 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code()); |
87 webkit_event.domCode = static_cast<int>(event.code()); | 88 webkit_event.domCode = static_cast<int>(event.code()); |
89 | |
90 ui::DomKey dom_key = event.GetDomKey(); | |
91 if (dom_key == ui::DomKey::CHARACTER) | |
92 webkit_event.domKey = static_cast<int>(event.GetCharacter()); | |
93 else | |
94 webkit_event.domKey = DOM_KEY_PRINT_NON_DIFF + static_cast<int>(dom_key); | |
Habib Virji
2015/06/24 14:32:12
Here a distinction is created if it is non-printab
| |
95 | |
88 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText(); | 96 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText(); |
89 webkit_event.text[0] = event.GetText(); | 97 webkit_event.text[0] = event.GetText(); |
90 | 98 |
91 webkit_event.setKeyIdentifierFromWindowsKeyCode(); | 99 webkit_event.setKeyIdentifierFromWindowsKeyCode(); |
92 | 100 |
93 return webkit_event; | 101 return webkit_event; |
94 } | 102 } |
95 | 103 |
96 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( | 104 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( |
97 const ui::ScrollEvent& event) { | 105 const ui::ScrollEvent& event) { |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
269 // event.native_event(). X11 is not so fortunate, there is no separate | 277 // event.native_event(). X11 is not so fortunate, there is no separate |
270 // translated event type, so DesktopHostLinux sends an extra KeyEvent with | 278 // translated event type, so DesktopHostLinux sends an extra KeyEvent with |
271 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function | 279 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function |
272 // to detect this case so the right event type can be constructed. | 280 // to detect this case so the right event type can be constructed. |
273 #if defined(OS_WIN) | 281 #if defined(OS_WIN) |
274 if (event.HasNativeEvent()) { | 282 if (event.HasNativeEvent()) { |
275 // Key events require no translation by the aura system. | 283 // Key events require no translation by the aura system. |
276 blink::WebKeyboardEvent webkit_event( | 284 blink::WebKeyboardEvent webkit_event( |
277 MakeWebKeyboardEventFromNativeEvent(event.native_event())); | 285 MakeWebKeyboardEventFromNativeEvent(event.native_event())); |
278 webkit_event.domCode = static_cast<int>(event.code()); | 286 webkit_event.domCode = static_cast<int>(event.code()); |
287 webkit_event.domKey = static_cast<int>(event.GetDomKey()); | |
288 if (webkit_event.domKey == DomKey::None) | |
289 webkit_event.domKey = static_cast<int>(event.GetCharacter()); | |
Habib Virji
2015/06/24 14:32:12
Missed updating code here will push in new patch t
| |
279 return webkit_event; | 290 return webkit_event; |
280 } | 291 } |
281 #endif | 292 #endif |
282 return MakeWebKeyboardEventFromAuraEvent(event); | 293 return MakeWebKeyboardEventFromAuraEvent(event); |
283 } | 294 } |
284 | 295 |
285 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) { | 296 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) { |
286 blink::WebGestureEvent gesture_event; | 297 blink::WebGestureEvent gesture_event; |
287 #if defined(OS_WIN) | 298 #if defined(OS_WIN) |
288 if (event.HasNativeEvent()) | 299 if (event.HasNativeEvent()) |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
395 webkit_event.deltaY = event.y_offset(); | 406 webkit_event.deltaY = event.y_offset(); |
396 } | 407 } |
397 | 408 |
398 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 409 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; |
399 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 410 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; |
400 | 411 |
401 return webkit_event; | 412 return webkit_event; |
402 } | 413 } |
403 | 414 |
404 } // namespace content | 415 } // namespace content |
OLD | NEW |