| 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 18 matching lines...) Expand all Loading... |
| 29 GestureProviderAura::~GestureProviderAura() {} | 29 GestureProviderAura::~GestureProviderAura() {} |
| 30 | 30 |
| 31 bool GestureProviderAura::OnTouchEvent(TouchEvent* event) { | 31 bool GestureProviderAura::OnTouchEvent(TouchEvent* event) { |
| 32 if (!pointer_state_.OnTouch(*event)) | 32 if (!pointer_state_.OnTouch(*event)) |
| 33 return false; | 33 return false; |
| 34 | 34 |
| 35 auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_); | 35 auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_); |
| 36 if (!result.succeeded) | 36 if (!result.succeeded) |
| 37 return false; | 37 return false; |
| 38 | 38 |
| 39 event->set_may_cause_scrolling(result.did_generate_scroll); | 39 event->set_may_cause_scrolling(result.moved_beyond_slop_region); |
| 40 pointer_state_.CleanupRemovedTouchPoints(*event); | 40 pointer_state_.CleanupRemovedTouchPoints(*event); |
| 41 return true; | 41 return true; |
| 42 } | 42 } |
| 43 | 43 |
| 44 void GestureProviderAura::OnTouchEventAck(uint32_t unique_event_id, | 44 void GestureProviderAura::OnTouchEventAck(uint32_t unique_event_id, |
| 45 bool event_consumed) { | 45 bool event_consumed) { |
| 46 DCHECK(pending_gestures_.empty()); | 46 DCHECK(pending_gestures_.empty()); |
| 47 DCHECK(!handling_event_); | 47 DCHECK(!handling_event_); |
| 48 base::AutoReset<bool> handling_event(&handling_event_, true); | 48 base::AutoReset<bool> handling_event(&handling_event_, true); |
| 49 filtered_gesture_provider_.OnTouchEventAck(unique_event_id, event_consumed); | 49 filtered_gesture_provider_.OnTouchEventAck(unique_event_id, event_consumed); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 68 if (pending_gestures_.empty()) | 68 if (pending_gestures_.empty()) |
| 69 return NULL; | 69 return NULL; |
| 70 // Caller is responsible for deleting old_pending_gestures. | 70 // Caller is responsible for deleting old_pending_gestures. |
| 71 ScopedVector<GestureEvent>* old_pending_gestures = | 71 ScopedVector<GestureEvent>* old_pending_gestures = |
| 72 new ScopedVector<GestureEvent>(); | 72 new ScopedVector<GestureEvent>(); |
| 73 old_pending_gestures->swap(pending_gestures_); | 73 old_pending_gestures->swap(pending_gestures_); |
| 74 return old_pending_gestures; | 74 return old_pending_gestures; |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace content | 77 } // namespace content |
| OLD | NEW |