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 // 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 return webkit_event; | 256 return webkit_event; |
257 } | 257 } |
258 | 258 |
259 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( | 259 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( |
260 ui::ScrollEvent* event) { | 260 ui::ScrollEvent* event) { |
261 WebKit::WebGestureEvent webkit_event; | 261 WebKit::WebGestureEvent webkit_event; |
262 | 262 |
263 switch (event->type()) { | 263 switch (event->type()) { |
264 case ui::ET_SCROLL: | 264 case ui::ET_SCROLL: |
265 webkit_event.type = WebKit::WebInputEvent::GestureScrollUpdate; | 265 webkit_event.type = WebKit::WebInputEvent::GestureScrollUpdate; |
| 266 webkit_event.data.scrollUpdate.deltaX = event->x_offset(); |
| 267 webkit_event.data.scrollUpdate.deltaY = event->y_offset(); |
266 break; | 268 break; |
267 case ui::ET_SCROLL_FLING_START: | 269 case ui::ET_SCROLL_FLING_START: |
268 webkit_event.type = WebKit::WebInputEvent::GestureFlingStart; | 270 webkit_event.type = WebKit::WebInputEvent::GestureFlingStart; |
| 271 webkit_event.data.flingStart.velocityX = event->x_offset(); |
| 272 webkit_event.data.flingStart.velocityY = event->y_offset(); |
269 break; | 273 break; |
270 case ui::ET_SCROLL_FLING_CANCEL: | 274 case ui::ET_SCROLL_FLING_CANCEL: |
271 webkit_event.type = WebKit::WebInputEvent::GestureFlingCancel; | 275 webkit_event.type = WebKit::WebInputEvent::GestureFlingCancel; |
272 break; | 276 break; |
273 default: | 277 default: |
274 NOTREACHED() << "Unknown gesture type: " << event->type(); | 278 NOTREACHED() << "Unknown gesture type: " << event->type(); |
275 } | 279 } |
276 | 280 |
277 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); | 281 webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); |
278 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); | 282 webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); |
| 283 |
| 284 // TODO(rbyers): deltaX/deltaY fields going away. crbug.com/143237 |
279 webkit_event.deltaX = event->x_offset(); | 285 webkit_event.deltaX = event->x_offset(); |
280 webkit_event.deltaY = event->y_offset(); | 286 webkit_event.deltaY = event->y_offset(); |
281 | 287 |
282 return webkit_event; | 288 return webkit_event; |
283 } | 289 } |
284 | 290 |
285 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( | 291 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( |
286 ui::KeyEvent* event) { | 292 ui::KeyEvent* event) { |
287 base::NativeEvent native_event = event->native_event(); | 293 base::NativeEvent native_event = event->native_event(); |
288 WebKit::WebKeyboardEvent webkit_event; | 294 WebKit::WebKeyboardEvent webkit_event; |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 | 482 |
477 // Update the type of the touch event. | 483 // Update the type of the touch event. |
478 web_event->type = TouchEventTypeFromEvent(event); | 484 web_event->type = TouchEventTypeFromEvent(event); |
479 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); | 485 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); |
480 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); | 486 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); |
481 | 487 |
482 return point; | 488 return point; |
483 } | 489 } |
484 | 490 |
485 } // namespace content | 491 } // namespace content |
OLD | NEW |