| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "ui/events/gestures/gesture_provider_aura.h" | 5 #include "ui/events/gestures/gesture_provider_aura.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_); | 36 auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_); |
| 37 if (!result.succeeded) | 37 if (!result.succeeded) |
| 38 return false; | 38 return false; |
| 39 | 39 |
| 40 event->set_may_cause_scrolling(result.moved_beyond_slop_region); | 40 event->set_may_cause_scrolling(result.moved_beyond_slop_region); |
| 41 pointer_state_.CleanupRemovedTouchPoints(*event); | 41 pointer_state_.CleanupRemovedTouchPoints(*event); |
| 42 return true; | 42 return true; |
| 43 } | 43 } |
| 44 | 44 |
| 45 void GestureProviderAura::OnTouchEventAck(uint32_t unique_touch_event_id, | 45 void GestureProviderAura::OnTouchEventAck(uint32_t unique_touch_event_id, |
| 46 bool event_consumed) { | 46 EventResult result) { |
| 47 DCHECK(pending_gestures_.empty()); | 47 DCHECK(pending_gestures_.empty()); |
| 48 DCHECK(!handling_event_); | 48 DCHECK(!handling_event_); |
| 49 base::AutoReset<bool> handling_event(&handling_event_, true); | 49 base::AutoReset<bool> handling_event(&handling_event_, true); |
| 50 filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id, | 50 filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id, result); |
| 51 event_consumed); | |
| 52 } | 51 } |
| 53 | 52 |
| 54 void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) { | 53 void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) { |
| 55 std::unique_ptr<ui::GestureEvent> event( | 54 std::unique_ptr<ui::GestureEvent> event( |
| 56 new ui::GestureEvent(gesture.x, gesture.y, gesture.flags, | 55 new ui::GestureEvent(gesture.x, gesture.y, gesture.flags, |
| 57 gesture.time, gesture.details, | 56 gesture.time, gesture.details, |
| 58 gesture.unique_touch_event_id)); | 57 gesture.unique_touch_event_id)); |
| 59 | 58 |
| 60 if (!handling_event_) { | 59 if (!handling_event_) { |
| 61 // Dispatching event caused by timer. | 60 // Dispatching event caused by timer. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 75 void GestureProviderAura::OnTouchEnter(int pointer_id, float x, float y) { | 74 void GestureProviderAura::OnTouchEnter(int pointer_id, float x, float y) { |
| 76 std::unique_ptr<TouchEvent> touch_event(new TouchEvent( | 75 std::unique_ptr<TouchEvent> touch_event(new TouchEvent( |
| 77 ET_TOUCH_PRESSED, gfx::Point(), ui::EventTimeForNow(), | 76 ET_TOUCH_PRESSED, gfx::Point(), ui::EventTimeForNow(), |
| 78 PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, pointer_id), | 77 PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, pointer_id), |
| 79 EF_IS_SYNTHESIZED, 0.0f)); | 78 EF_IS_SYNTHESIZED, 0.0f)); |
| 80 gfx::PointF point(x, y); | 79 gfx::PointF point(x, y); |
| 81 touch_event->set_location_f(point); | 80 touch_event->set_location_f(point); |
| 82 touch_event->set_root_location_f(point); | 81 touch_event->set_root_location_f(point); |
| 83 | 82 |
| 84 OnTouchEvent(touch_event.get()); | 83 OnTouchEvent(touch_event.get()); |
| 85 OnTouchEventAck(touch_event->unique_event_id(), true); | 84 OnTouchEventAck(touch_event->unique_event_id(), ER_CONSUMED); |
| 86 } | 85 } |
| 87 | 86 |
| 88 } // namespace content | 87 } // namespace content |
| OLD | NEW |