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

Unified Diff: ui/events/gestures/gesture_recognizer_impl.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-event: mandol_line Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/gestures/gesture_provider_aura_unittest.cc ('k') | ui/events/gestures/motion_event_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gestures/gesture_recognizer_impl.cc
diff --git a/ui/events/gestures/gesture_recognizer_impl.cc b/ui/events/gestures/gesture_recognizer_impl.cc
index df2c354c3763e952b7bcfc9a15b9c8444224ff48..3fe59184f364f1b4e313786bbb19ed1f34b5a0e2 100644
--- a/ui/events/gestures/gesture_recognizer_impl.cc
+++ b/ui/events/gestures/gesture_recognizer_impl.cc
@@ -172,17 +172,14 @@ bool GestureRecognizerImpl::CancelActiveTouches(GestureConsumer* consumer) {
// pointer_state is modified every time after DispatchCancelTouchEvent.
scoped_ptr<MotionEvent> pointer_state_clone = pointer_state.Clone();
for (size_t i = 0; i < pointer_state_clone->GetPointerCount(); ++i) {
- gfx::PointF point(pointer_state_clone->GetX(i),
- pointer_state_clone->GetY(i));
- TouchEvent touch_event(ui::ET_TOUCH_CANCELLED,
- point,
+ TouchEvent touch_event(ui::ET_TOUCH_CANCELLED, gfx::Point(),
ui::EF_IS_SYNTHESIZED,
pointer_state_clone->GetPointerId(i),
- ui::EventTimeForNow(),
- 0.0f,
- 0.0f,
- 0.0f,
- 0.0f);
+ ui::EventTimeForNow(), 0.0f, 0.0f, 0.0f, 0.0f);
+ gfx::PointF point(pointer_state_clone->GetX(i),
+ pointer_state_clone->GetY(i));
+ touch_event.set_location_f(point);
+ touch_event.set_root_location_f(point);
GestureEventHelper* helper = FindDispatchHelperForConsumer(consumer);
if (helper)
helper->DispatchCancelTouchEvent(&touch_event);
« no previous file with comments | « ui/events/gestures/gesture_provider_aura_unittest.cc ('k') | ui/events/gestures/motion_event_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698