OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/public/browser/native_web_keyboard_event.h" | 5 #include "content/public/browser/native_web_keyboard_event.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/renderer_host/web_input_event_aura.h" | 8 #include "content/browser/renderer_host/web_input_event_aura.h" |
9 #include "ui/events/event.h" | 9 #include "ui/events/event.h" |
10 | 10 |
11 namespace { | 11 namespace { |
12 | 12 |
13 // We need to copy |os_event| in NativeWebKeyboardEvent because it is | 13 // We need to copy |os_event| in NativeWebKeyboardEvent because it is |
14 // queued in RenderWidgetHost and may be passed and used | 14 // queued in RenderWidgetHost and may be passed and used |
15 // RenderViewHostDelegate::HandledKeybardEvent after the original aura | 15 // RenderViewHostDelegate::HandledKeybardEvent after the original aura |
16 // event is destroyed. | 16 // event is destroyed. |
17 ui::Event* CopyEvent(ui::Event* event) { | 17 ui::Event* CopyEvent(ui::Event* event) { |
18 return event ? static_cast<ui::KeyEvent*>(event)->Copy() : NULL; | 18 return event ? new ui::KeyEvent(*static_cast<ui::KeyEvent*>(event)) : NULL; |
19 } | 19 } |
20 | 20 |
21 int EventFlagsToWebInputEventModifiers(int flags) { | 21 int EventFlagsToWebInputEventModifiers(int flags) { |
22 return | 22 return |
23 (flags & ui::EF_SHIFT_DOWN ? blink::WebInputEvent::ShiftKey : 0) | | 23 (flags & ui::EF_SHIFT_DOWN ? blink::WebInputEvent::ShiftKey : 0) | |
24 (flags & ui::EF_CONTROL_DOWN ? blink::WebInputEvent::ControlKey : 0) | | 24 (flags & ui::EF_CONTROL_DOWN ? blink::WebInputEvent::ControlKey : 0) | |
25 (flags & ui::EF_CAPS_LOCK_DOWN ? blink::WebInputEvent::CapsLockOn : 0) | | 25 (flags & ui::EF_CAPS_LOCK_DOWN ? blink::WebInputEvent::CapsLockOn : 0) | |
26 (flags & ui::EF_ALT_DOWN ? blink::WebInputEvent::AltKey : 0); | 26 (flags & ui::EF_ALT_DOWN ? blink::WebInputEvent::AltKey : 0); |
27 } | 27 } |
28 | 28 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 skip_in_browser = other.skip_in_browser; | 90 skip_in_browser = other.skip_in_browser; |
91 | 91 |
92 return *this; | 92 return *this; |
93 } | 93 } |
94 | 94 |
95 NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { | 95 NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { |
96 delete os_event; | 96 delete os_event; |
97 } | 97 } |
98 | 98 |
99 } // namespace content | 99 } // namespace content |
OLD | NEW |