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