| 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/window.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 const base::NativeEvent& native_event); | 21 const base::NativeEvent& native_event); |
| 22 blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( | 22 blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( |
| 23 const base::NativeEvent& native_event); | 23 const base::NativeEvent& native_event); |
| 24 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( | 24 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( |
| 25 const base::NativeEvent& native_event); | 25 const base::NativeEvent& native_event); |
| 26 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent( | 26 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent( |
| 27 const base::NativeEvent& native_event); | 27 const base::NativeEvent& native_event); |
| 28 #endif | 28 #endif |
| 29 #if defined(USE_X11) || defined(USE_OZONE) | 29 #if defined(USE_X11) || defined(USE_OZONE) |
| 30 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( | 30 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( |
| 31 ui::KeyEvent* event) { | 31 const ui::KeyEvent* event) { |
| 32 blink::WebKeyboardEvent webkit_event; | 32 blink::WebKeyboardEvent webkit_event; |
| 33 | 33 |
| 34 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); | 34 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); |
| 35 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); | 35 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); |
| 36 | 36 |
| 37 switch (event->type()) { | 37 switch (event->type()) { |
| 38 case ui::ET_KEY_PRESSED: | 38 case ui::ET_KEY_PRESSED: |
| 39 webkit_event.type = event->is_char() ? blink::WebInputEvent::Char : | 39 webkit_event.type = event->is_char() ? blink::WebInputEvent::Char : |
| 40 blink::WebInputEvent::RawKeyDown; | 40 blink::WebInputEvent::RawKeyDown; |
| 41 break; | 41 break; |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 webkit_event.windowX = webkit_event.x = event->x(); | 215 webkit_event.windowX = webkit_event.x = event->x(); |
| 216 webkit_event.windowY = webkit_event.y = event->y(); | 216 webkit_event.windowY = webkit_event.y = event->y(); |
| 217 | 217 |
| 218 const gfx::Point root_point = event->root_location(); | 218 const gfx::Point root_point = event->root_location(); |
| 219 webkit_event.globalX = root_point.x(); | 219 webkit_event.globalX = root_point.x(); |
| 220 webkit_event.globalY = root_point.y(); | 220 webkit_event.globalY = root_point.y(); |
| 221 | 221 |
| 222 return webkit_event; | 222 return webkit_event; |
| 223 } | 223 } |
| 224 | 224 |
| 225 blink::WebKeyboardEvent MakeWebKeyboardEvent(ui::KeyEvent* event) { | 225 blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent* event) { |
| 226 // Windows can figure out whether or not to construct a RawKeyDown or a Char | 226 // Windows can figure out whether or not to construct a RawKeyDown or a Char |
| 227 // WebInputEvent based on the type of message carried in | 227 // WebInputEvent based on the type of message carried in |
| 228 // event->native_event(). X11 is not so fortunate, there is no separate | 228 // event->native_event(). X11 is not so fortunate, there is no separate |
| 229 // translated event type, so DesktopHostLinux sends an extra KeyEvent with | 229 // translated event type, so DesktopHostLinux sends an extra KeyEvent with |
| 230 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function | 230 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function |
| 231 // to detect this case so the right event type can be constructed. | 231 // to detect this case so the right event type can be constructed. |
| 232 #if defined(OS_WIN) | 232 #if defined(OS_WIN) |
| 233 if (!event->HasNativeEvent()) | 233 if (!event->HasNativeEvent()) |
| 234 return blink::WebKeyboardEvent(); | 234 return blink::WebKeyboardEvent(); |
| 235 | 235 |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 webkit_event.deltaY = event->y_offset(); | 352 webkit_event.deltaY = event->y_offset(); |
| 353 } | 353 } |
| 354 | 354 |
| 355 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; | 355 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; |
| 356 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; | 356 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; |
| 357 | 357 |
| 358 return webkit_event; | 358 return webkit_event; |
| 359 } | 359 } |
| 360 | 360 |
| 361 } // namespace content | 361 } // namespace content |
| OLD | NEW |