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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 case ui::ET_KEY_RELEASED: | 77 case ui::ET_KEY_RELEASED: |
78 webkit_event.type = blink::WebInputEvent::KeyUp; | 78 webkit_event.type = blink::WebInputEvent::KeyUp; |
79 break; | 79 break; |
80 default: | 80 default: |
81 NOTREACHED(); | 81 NOTREACHED(); |
82 } | 82 } |
83 | 83 |
84 if (webkit_event.modifiers & blink::WebInputEvent::AltKey) | 84 if (webkit_event.modifiers & blink::WebInputEvent::AltKey) |
85 webkit_event.isSystemKey = true; | 85 webkit_event.isSystemKey = true; |
86 | 86 |
87 webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode(); | 87 webkit_event.windowsKeyCode = event.key_code(); |
kpschoedel
2015/09/01 20:51:22
I suspect mojo/converters/input_events/input_event
dtapuska
2015/09/01 20:54:11
ui::Event modifiers didn't seem to be serialized a
kpschoedel
2015/09/02 15:05:45
I think the intent is for the ui::Event → input_ev
| |
88 webkit_event.nativeKeyCode = | 88 webkit_event.nativeKeyCode = |
89 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code()); | 89 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code()); |
90 webkit_event.domCode = static_cast<int>(event.code()); | 90 webkit_event.domCode = static_cast<int>(event.code()); |
91 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText(); | 91 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText(); |
92 webkit_event.text[0] = event.GetText(); | 92 webkit_event.text[0] = event.GetText(); |
93 | 93 |
94 webkit_event.setKeyIdentifierFromWindowsKeyCode(); | 94 webkit_event.setKeyIdentifierFromWindowsKeyCode(); |
95 | 95 |
96 return webkit_event; | 96 return webkit_event; |
97 } | 97 } |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
399 webkit_event.deltaY = event.y_offset(); | 399 webkit_event.deltaY = event.y_offset(); |
400 } | 400 } |
401 | 401 |
402 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 402 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; |
403 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 403 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; |
404 | 404 |
405 return webkit_event; | 405 return webkit_event; |
406 } | 406 } |
407 | 407 |
408 } // namespace content | 408 } // namespace content |
OLD | NEW |