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" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 NOTREACHED(); | 78 NOTREACHED(); |
79 } | 79 } |
80 | 80 |
81 if (webkit_event.modifiers & blink::WebInputEvent::AltKey) | 81 if (webkit_event.modifiers & blink::WebInputEvent::AltKey) |
82 webkit_event.isSystemKey = true; | 82 webkit_event.isSystemKey = true; |
83 | 83 |
84 webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode(); | 84 webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode(); |
85 webkit_event.nativeKeyCode = | 85 webkit_event.nativeKeyCode = |
86 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code()); | 86 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code()); |
87 webkit_event.domCode = static_cast<int>(event.code()); | 87 webkit_event.domCode = static_cast<int>(event.code()); |
88 webkit_event.domKey = static_cast<int>(event.GetDomKey()); | |
dtapuska
2015/06/18 14:28:30
These methods do not trap the KEY_PRESSED events t
Wez
2015/06/25 10:40:21
As discussed, keyIdentifier is deprecated and shou
| |
89 webkit_event.domKeyChar = static_cast<int>(event.GetCharacter()); | |
90 | |
88 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText(); | 91 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText(); |
89 webkit_event.text[0] = event.GetText(); | 92 webkit_event.text[0] = event.GetText(); |
90 | 93 |
91 webkit_event.setKeyIdentifierFromWindowsKeyCode(); | 94 webkit_event.setKeyIdentifierFromWindowsKeyCode(); |
92 | 95 |
93 return webkit_event; | 96 return webkit_event; |
94 } | 97 } |
95 | 98 |
96 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( | 99 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( |
97 const ui::ScrollEvent& event) { | 100 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 | 272 // event.native_event(). X11 is not so fortunate, there is no separate |
270 // translated event type, so DesktopHostLinux sends an extra KeyEvent with | 273 // 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 | 274 // 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. | 275 // to detect this case so the right event type can be constructed. |
273 #if defined(OS_WIN) | 276 #if defined(OS_WIN) |
274 if (event.HasNativeEvent()) { | 277 if (event.HasNativeEvent()) { |
275 // Key events require no translation by the aura system. | 278 // Key events require no translation by the aura system. |
276 blink::WebKeyboardEvent webkit_event( | 279 blink::WebKeyboardEvent webkit_event( |
277 MakeWebKeyboardEventFromNativeEvent(event.native_event())); | 280 MakeWebKeyboardEventFromNativeEvent(event.native_event())); |
278 webkit_event.domCode = static_cast<int>(event.code()); | 281 webkit_event.domCode = static_cast<int>(event.code()); |
282 webkit_event.domKey = static_cast<int>(event.GetDomKey()); | |
283 webkit_event.domKeyChar = static_cast<int>(event.GetCharacter()); | |
279 return webkit_event; | 284 return webkit_event; |
280 } | 285 } |
281 #endif | 286 #endif |
282 return MakeWebKeyboardEventFromAuraEvent(event); | 287 return MakeWebKeyboardEventFromAuraEvent(event); |
283 } | 288 } |
284 | 289 |
285 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) { | 290 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) { |
286 blink::WebGestureEvent gesture_event; | 291 blink::WebGestureEvent gesture_event; |
287 #if defined(OS_WIN) | 292 #if defined(OS_WIN) |
288 if (event.HasNativeEvent()) | 293 if (event.HasNativeEvent()) |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
395 webkit_event.deltaY = event.y_offset(); | 400 webkit_event.deltaY = event.y_offset(); |
396 } | 401 } |
397 | 402 |
398 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 403 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; |
399 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 404 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; |
400 | 405 |
401 return webkit_event; | 406 return webkit_event; |
402 } | 407 } |
403 | 408 |
404 } // namespace content | 409 } // namespace content |
OLD | NEW |