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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent( | 45 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent( |
46 const base::NativeEvent& native_event); | 46 const base::NativeEvent& native_event); |
47 #endif | 47 #endif |
48 | 48 |
49 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( | 49 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( |
50 const ui::KeyEvent& event) { | 50 const ui::KeyEvent& event) { |
51 blink::WebKeyboardEvent webkit_event; | 51 blink::WebKeyboardEvent webkit_event; |
52 | 52 |
53 webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); | 53 webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); |
54 webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); | 54 webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); |
| 55 switch (ui::KeycodeConverter::DomCodeToLocation(event.code())) { |
| 56 case ui::DomKeyLocation::LEFT: |
| 57 webkit_event.modifiers |= blink::WebInputEvent::IsLeft; |
| 58 break; |
| 59 case ui::DomKeyLocation::RIGHT: |
| 60 webkit_event.modifiers |= blink::WebInputEvent::IsRight; |
| 61 break; |
| 62 case ui::DomKeyLocation::NUMPAD: |
| 63 webkit_event.modifiers |= blink::WebInputEvent::IsKeyPad; |
| 64 break; |
| 65 case ui::DomKeyLocation::STANDARD: |
| 66 break; |
| 67 } |
55 | 68 |
56 switch (event.type()) { | 69 switch (event.type()) { |
57 case ui::ET_KEY_PRESSED: | 70 case ui::ET_KEY_PRESSED: |
58 webkit_event.type = event.is_char() ? blink::WebInputEvent::Char : | 71 webkit_event.type = event.is_char() ? blink::WebInputEvent::Char : |
59 blink::WebInputEvent::RawKeyDown; | 72 blink::WebInputEvent::RawKeyDown; |
60 break; | 73 break; |
61 case ui::ET_KEY_RELEASED: | 74 case ui::ET_KEY_RELEASED: |
62 webkit_event.type = blink::WebInputEvent::KeyUp; | 75 webkit_event.type = blink::WebInputEvent::KeyUp; |
63 break; | 76 break; |
64 default: | 77 default: |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 webkit_event.deltaY = event.y_offset(); | 392 webkit_event.deltaY = event.y_offset(); |
380 } | 393 } |
381 | 394 |
382 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 395 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; |
383 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 396 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; |
384 | 397 |
385 return webkit_event; | 398 return webkit_event; |
386 } | 399 } |
387 | 400 |
388 } // namespace content | 401 } // namespace content |
OLD | NEW |