| 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 // Portions based heavily on: | 5 // Portions based heavily on: |
| 6 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp | 6 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp |
| 7 // | 7 // |
| 8 /* | 8 /* |
| 9 * Copyright (C) 2006-2011 Google Inc. All rights reserved. | 9 * Copyright (C) 2006-2011 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 NOTIMPLEMENTED() << "Received unexpected event: " << event->type(); | 247 NOTIMPLEMENTED() << "Received unexpected event: " << event->type(); |
| 248 break; | 248 break; |
| 249 } | 249 } |
| 250 | 250 |
| 251 return webkit_event; | 251 return webkit_event; |
| 252 } | 252 } |
| 253 | 253 |
| 254 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( | 254 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( |
| 255 aura::MouseEvent* event) { | 255 aura::MouseEvent* event) { |
| 256 WebKit::WebMouseWheelEvent webkit_event; | 256 WebKit::WebMouseWheelEvent webkit_event; |
| 257 // TODO(sadrul): ! | 257 |
| 258 webkit_event.type = WebKit::WebInputEvent::MouseWheel; |
| 259 webkit_event.button = WebKit::WebMouseEvent::ButtonNone; |
| 260 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); |
| 261 webkit_event.timeStampSeconds = event->time_stamp().ToDoubleT(); |
| 262 webkit_event.deltaY = ui::GetMouseWheelOffset(event->native_event()); |
| 263 webkit_event.wheelTicksY = webkit_event.deltaY > 0 ? 1 : -1; |
| 264 |
| 258 return webkit_event; | 265 return webkit_event; |
| 259 } | 266 } |
| 260 | 267 |
| 261 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( | 268 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( |
| 262 aura::KeyEvent* event) { | 269 aura::KeyEvent* event) { |
| 263 base::NativeEvent native_event = event->native_event(); | 270 base::NativeEvent native_event = event->native_event(); |
| 264 WebKit::WebKeyboardEvent webkit_event; | 271 WebKit::WebKeyboardEvent webkit_event; |
| 265 XKeyEvent* native_key_event = &native_event->xkey; | 272 XKeyEvent* native_key_event = &native_event->xkey; |
| 266 | 273 |
| 267 webkit_event.timeStampSeconds = | 274 webkit_event.timeStampSeconds = |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 } | 313 } |
| 307 | 314 |
| 308 webkit_event.setKeyIdentifierFromWindowsKeyCode(); | 315 webkit_event.setKeyIdentifierFromWindowsKeyCode(); |
| 309 | 316 |
| 310 // TODO: IsAutoRepeat/IsKeyPad? | 317 // TODO: IsAutoRepeat/IsKeyPad? |
| 311 | 318 |
| 312 return webkit_event; | 319 return webkit_event; |
| 313 } | 320 } |
| 314 | 321 |
| 315 } // namespace content | 322 } // namespace content |
| OLD | NEW |