Chromium Code Reviews| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 352 break; | 352 break; |
| 353 case ui::ET_GESTURE_PINCH_UPDATE: | 353 case ui::ET_GESTURE_PINCH_UPDATE: |
| 354 gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate; | 354 gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate; |
| 355 break; | 355 break; |
| 356 case ui::ET_GESTURE_PINCH_END: | 356 case ui::ET_GESTURE_PINCH_END: |
| 357 gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd; | 357 gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd; |
| 358 break; | 358 break; |
| 359 case ui::ET_GESTURE_LONG_PRESS: | 359 case ui::ET_GESTURE_LONG_PRESS: |
| 360 // TODO(tdresser): Integrate long press with WebKit | 360 // TODO(tdresser): Integrate long press with WebKit |
| 361 break; | 361 break; |
| 362 case ui::ET_GESTURE_THREE_FINGER_SWIPE: | |
|
sadrul
2012/04/10 20:32:51
Do we need this here? Presumably this should never
tdresser
2012/04/11 18:17:04
Done.
| |
| 363 break; | |
| 362 default: | 364 default: |
| 363 NOTREACHED() << "Unknown gesture type: " << event->type(); | 365 NOTREACHED() << "Unknown gesture type: " << event->type(); |
| 364 } | 366 } |
| 365 | 367 |
| 366 gesture_event.deltaX = event->delta_x(); | 368 gesture_event.deltaX = event->delta_x(); |
| 367 gesture_event.deltaY = event->delta_y(); | 369 gesture_event.deltaY = event->delta_y(); |
| 368 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); | 370 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); |
| 369 | 371 |
| 370 return gesture_event; | 372 return gesture_event; |
| 371 } | 373 } |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 434 | 436 |
| 435 // Update the type of the touch event. | 437 // Update the type of the touch event. |
| 436 web_event->type = TouchEventTypeFromEvent(event); | 438 web_event->type = TouchEventTypeFromEvent(event); |
| 437 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); | 439 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); |
| 438 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); | 440 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); |
| 439 | 441 |
| 440 return point; | 442 return point; |
| 441 } | 443 } |
| 442 | 444 |
| 443 } // namespace content | 445 } // namespace content |
| OLD | NEW |