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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 void GestureProviderAura::OnTouchEventAck(uint32_t unique_event_id, | 45 void GestureProviderAura::OnTouchEventAck(uint32_t unique_event_id, |
46 bool event_consumed) { | 46 bool event_consumed) { |
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_event_id, event_consumed); | 50 filtered_gesture_provider_.OnTouchEventAck(unique_event_id, event_consumed); |
51 } | 51 } |
52 | 52 |
53 void GestureProviderAura::OnGestureEvent( | 53 void GestureProviderAura::OnGestureEvent( |
54 const GestureEventData& gesture) { | 54 const GestureEventData& gesture) { |
55 std::unique_ptr<ui::GestureEvent> event( | 55 std::unique_ptr<ui::GestureEvent> event(new ui::GestureEvent( |
56 new ui::GestureEvent(gesture.x, gesture.y, gesture.flags, | 56 gesture.x, gesture.y, gesture.flags, gesture.time, gesture.details)); |
57 gesture.time - base::TimeTicks(), gesture.details)); | |
58 | 57 |
59 if (!handling_event_) { | 58 if (!handling_event_) { |
60 // Dispatching event caused by timer. | 59 // Dispatching event caused by timer. |
61 client_->OnGestureEvent(gesture_consumer_, event.get()); | 60 client_->OnGestureEvent(gesture_consumer_, event.get()); |
62 } else { | 61 } else { |
63 // Memory managed by ScopedVector pending_gestures_. | 62 // Memory managed by ScopedVector pending_gestures_. |
64 pending_gestures_.push_back(std::move(event)); | 63 pending_gestures_.push_back(std::move(event)); |
65 } | 64 } |
66 } | 65 } |
67 | 66 |
(...skipping 13 matching lines...) Expand all Loading... |
81 ui::EventTimeForNow(), 0.0f, 0.0f, 0.0f, 0.0f)); | 80 ui::EventTimeForNow(), 0.0f, 0.0f, 0.0f, 0.0f)); |
82 gfx::PointF point(x, y); | 81 gfx::PointF point(x, y); |
83 touch_event->set_location_f(point); | 82 touch_event->set_location_f(point); |
84 touch_event->set_root_location_f(point); | 83 touch_event->set_root_location_f(point); |
85 | 84 |
86 OnTouchEvent(touch_event.get()); | 85 OnTouchEvent(touch_event.get()); |
87 OnTouchEventAck(touch_event->unique_event_id(), true); | 86 OnTouchEventAck(touch_event->unique_event_id(), true); |
88 } | 87 } |
89 | 88 |
90 } // namespace content | 89 } // namespace content |
OLD | NEW |