| 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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 break; | 361 break; |
| 362 case ui::ET_SCROLL_FLING_CANCEL: | 362 case ui::ET_SCROLL_FLING_CANCEL: |
| 363 gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel; | 363 gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel; |
| 364 break; | 364 break; |
| 365 case ui::ET_GESTURE_LONG_PRESS: | 365 case ui::ET_GESTURE_LONG_PRESS: |
| 366 gesture_event.type = WebKit::WebInputEvent::GestureLongPress; | 366 gesture_event.type = WebKit::WebInputEvent::GestureLongPress; |
| 367 break; | 367 break; |
| 368 case ui::ET_GESTURE_TWO_FINGER_TAP: | 368 case ui::ET_GESTURE_TWO_FINGER_TAP: |
| 369 gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap; | 369 gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap; |
| 370 break; | 370 break; |
| 371 case ui::ET_GESTURE_BEGIN: | 371 case ui::ET_GESTURE_TAP_UP: |
| 372 case ui::ET_GESTURE_END: | |
| 373 case ui::ET_GESTURE_MULTIFINGER_SWIPE: | 372 case ui::ET_GESTURE_MULTIFINGER_SWIPE: |
| 374 break; | 373 break; |
| 375 default: | 374 default: |
| 376 NOTREACHED() << "Unknown gesture type: " << event->type(); | 375 NOTREACHED() << "Unknown gesture type: " << event->type(); |
| 377 } | 376 } |
| 378 | 377 |
| 379 gesture_event.deltaX = event->delta_x(); | 378 gesture_event.deltaX = event->delta_x(); |
| 380 gesture_event.deltaY = event->delta_y(); | 379 gesture_event.deltaY = event->delta_y(); |
| 381 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); | 380 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); |
| 382 | 381 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 | 447 |
| 449 // Update the type of the touch event. | 448 // Update the type of the touch event. |
| 450 web_event->type = TouchEventTypeFromEvent(event); | 449 web_event->type = TouchEventTypeFromEvent(event); |
| 451 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); | 450 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); |
| 452 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); | 451 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); |
| 453 | 452 |
| 454 return point; | 453 return point; |
| 455 } | 454 } |
| 456 | 455 |
| 457 } // namespace content | 456 } // namespace content |
| OLD | NEW |