Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(685)

Side by Side Diff: content/browser/renderer_host/web_input_event_aurax11.cc

Issue 10824158: Pass tap count (1 or 2) with tap gesture events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 return webkit_event; 357 return webkit_event;
358 } 358 }
359 359
360 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( 360 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
361 aura::GestureEvent* event) { 361 aura::GestureEvent* event) {
362 WebKit::WebGestureEvent gesture_event; 362 WebKit::WebGestureEvent gesture_event;
363 363
364 switch (event->type()) { 364 switch (event->type()) {
365 case ui::ET_GESTURE_TAP: 365 case ui::ET_GESTURE_TAP:
366 gesture_event.type = WebKit::WebInputEvent::GestureTap; 366 gesture_event.type = WebKit::WebInputEvent::GestureTap;
367 gesture_event.deltaX = event->details().tap_count();
367 break; 368 break;
368 case ui::ET_GESTURE_TAP_DOWN: 369 case ui::ET_GESTURE_TAP_DOWN:
369 gesture_event.type = WebKit::WebInputEvent::GestureTapDown; 370 gesture_event.type = WebKit::WebInputEvent::GestureTapDown;
370 break; 371 break;
371 case ui::ET_GESTURE_DOUBLE_TAP: 372 case ui::ET_GESTURE_DOUBLE_TAP:
372 gesture_event.type = WebKit::WebInputEvent::GestureDoubleTap; 373 gesture_event.type = WebKit::WebInputEvent::GestureDoubleTap;
373 break; 374 break;
374 case ui::ET_GESTURE_SCROLL_BEGIN: 375 case ui::ET_GESTURE_SCROLL_BEGIN:
375 gesture_event.type = WebKit::WebInputEvent::GestureScrollBegin; 376 gesture_event.type = WebKit::WebInputEvent::GestureScrollBegin;
376 break; 377 break;
377 case ui::ET_GESTURE_SCROLL_UPDATE: 378 case ui::ET_GESTURE_SCROLL_UPDATE:
378 gesture_event.type = WebKit::WebInputEvent::GestureScrollUpdate; 379 gesture_event.type = WebKit::WebInputEvent::GestureScrollUpdate;
380 gesture_event.deltaX = event->details().scroll_x();
381 gesture_event.deltaY = event->details().scroll_y();
379 break; 382 break;
380 case ui::ET_GESTURE_SCROLL_END: 383 case ui::ET_GESTURE_SCROLL_END:
381 gesture_event.type = WebKit::WebInputEvent::GestureScrollEnd; 384 gesture_event.type = WebKit::WebInputEvent::GestureScrollEnd;
382 break; 385 break;
383 case ui::ET_GESTURE_PINCH_BEGIN: 386 case ui::ET_GESTURE_PINCH_BEGIN:
384 gesture_event.type = WebKit::WebInputEvent::GesturePinchBegin; 387 gesture_event.type = WebKit::WebInputEvent::GesturePinchBegin;
385 break; 388 break;
386 case ui::ET_GESTURE_PINCH_UPDATE: 389 case ui::ET_GESTURE_PINCH_UPDATE:
387 gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate; 390 gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate;
391 gesture_event.deltaX = event->details().scale();
388 break; 392 break;
389 case ui::ET_GESTURE_PINCH_END: 393 case ui::ET_GESTURE_PINCH_END:
390 gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd; 394 gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd;
391 break; 395 break;
392 case ui::ET_SCROLL_FLING_START: 396 case ui::ET_SCROLL_FLING_START:
393 gesture_event.type = WebKit::WebInputEvent::GestureFlingStart; 397 gesture_event.type = WebKit::WebInputEvent::GestureFlingStart;
398 gesture_event.deltaX = event->details().velocity_x();
399 gesture_event.deltaY = event->details().velocity_y();
394 break; 400 break;
395 case ui::ET_SCROLL_FLING_CANCEL: 401 case ui::ET_SCROLL_FLING_CANCEL:
396 gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel; 402 gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel;
397 break; 403 break;
398 case ui::ET_GESTURE_LONG_PRESS: 404 case ui::ET_GESTURE_LONG_PRESS:
399 gesture_event.type = WebKit::WebInputEvent::GestureLongPress; 405 gesture_event.type = WebKit::WebInputEvent::GestureLongPress;
400 break; 406 break;
401 case ui::ET_GESTURE_TWO_FINGER_TAP: 407 case ui::ET_GESTURE_TWO_FINGER_TAP:
402 gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap; 408 gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap;
403 break; 409 break;
404 case ui::ET_GESTURE_BEGIN: 410 case ui::ET_GESTURE_BEGIN:
405 case ui::ET_GESTURE_END: 411 case ui::ET_GESTURE_END:
406 case ui::ET_GESTURE_MULTIFINGER_SWIPE: 412 case ui::ET_GESTURE_MULTIFINGER_SWIPE:
407 break; 413 break;
408 default: 414 default:
409 NOTREACHED() << "Unknown gesture type: " << event->type(); 415 NOTREACHED() << "Unknown gesture type: " << event->type();
410 } 416 }
411 417
412 gesture_event.boundingBox = event->details().bounding_box(); 418 gesture_event.boundingBox = event->details().bounding_box();
413 gesture_event.deltaX = event->details().generic_x();
414 gesture_event.deltaY = event->details().generic_y();
415 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); 419 gesture_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
416 420
417 return gesture_event; 421 return gesture_event;
418 } 422 }
419 423
420 WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent( 424 WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(
421 aura::TouchEvent* event, WebKit::WebTouchEvent* web_event) { 425 aura::TouchEvent* event, WebKit::WebTouchEvent* web_event) {
422 WebKit::WebTouchPoint* point = NULL; 426 WebKit::WebTouchPoint* point = NULL;
423 switch (event->type()) { 427 switch (event->type()) {
424 case ui::ET_TOUCH_PRESSED: 428 case ui::ET_TOUCH_PRESSED:
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 486
483 // Update the type of the touch event. 487 // Update the type of the touch event.
484 web_event->type = TouchEventTypeFromEvent(event); 488 web_event->type = TouchEventTypeFromEvent(event);
485 web_event->timeStampSeconds = event->time_stamp().InSecondsF(); 489 web_event->timeStampSeconds = event->time_stamp().InSecondsF();
486 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags()); 490 web_event->modifiers = EventFlagsToWebEventModifiers(event->flags());
487 491
488 return point; 492 return point;
489 } 493 }
490 494
491 } // namespace content 495 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698