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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 event->details().bounding_box().width(); | 396 event->details().bounding_box().width(); |
397 gesture_event.data.longPress.height = | 397 gesture_event.data.longPress.height = |
398 event->details().bounding_box().height(); | 398 event->details().bounding_box().height(); |
399 break; | 399 break; |
400 case ui::ET_GESTURE_TWO_FINGER_TAP: | 400 case ui::ET_GESTURE_TWO_FINGER_TAP: |
401 gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap; | 401 gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap; |
402 break; | 402 break; |
403 case ui::ET_GESTURE_BEGIN: | 403 case ui::ET_GESTURE_BEGIN: |
404 case ui::ET_GESTURE_END: | 404 case ui::ET_GESTURE_END: |
405 case ui::ET_GESTURE_MULTIFINGER_SWIPE: | 405 case ui::ET_GESTURE_MULTIFINGER_SWIPE: |
| 406 case ui::ET_GESTURE_TAP_CANCEL: |
| 407 gesture_event.type = WebKit::WebInputEvent::Undefined; |
406 break; | 408 break; |
407 default: | 409 default: |
408 NOTREACHED() << "Unknown gesture type: " << event->type(); | 410 NOTREACHED() << "Unknown gesture type: " << event->type(); |
409 } | 411 } |
410 | 412 |
411 // TODO(rbyers): Also stop setting boundingBox for all events (as for delta | 413 // TODO(rbyers): Also stop setting boundingBox for all events (as for delta |
412 // above). | 414 // above). |
413 gesture_event.boundingBox = event->details().bounding_box(); | 415 gesture_event.boundingBox = event->details().bounding_box(); |
414 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); | 416 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); |
415 gesture_event.timeStampSeconds = event->time_stamp().InSecondsF(); | 417 gesture_event.timeStampSeconds = event->time_stamp().InSecondsF(); |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 | 484 |
483 // Update the type of the touch event. | 485 // Update the type of the touch event. |
484 web_event->type = TouchEventTypeFromEvent(event); | 486 web_event->type = TouchEventTypeFromEvent(event); |
485 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); | 487 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); |
486 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); | 488 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); |
487 | 489 |
488 return point; | 490 return point; |
489 } | 491 } |
490 | 492 |
491 } // namespace content | 493 } // namespace content |
OLD | NEW |