OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/renderer/input/input_event_filter.h" | 5 #include "content/renderer/input/input_event_filter.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/bind.h" | 10 #include "base/bind.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 namespace content { | 43 namespace content { |
44 | 44 |
45 InputEventFilter::InputEventFilter( | 45 InputEventFilter::InputEventFilter( |
46 const base::Callback<void(const IPC::Message&)>& main_listener, | 46 const base::Callback<void(const IPC::Message&)>& main_listener, |
47 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, | 47 const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, |
48 const scoped_refptr<base::SingleThreadTaskRunner>& target_task_runner) | 48 const scoped_refptr<base::SingleThreadTaskRunner>& target_task_runner) |
49 : main_task_runner_(main_task_runner), | 49 : main_task_runner_(main_task_runner), |
50 main_listener_(main_listener), | 50 main_listener_(main_listener), |
51 sender_(NULL), | 51 sender_(NULL), |
52 target_task_runner_(target_task_runner), | 52 target_task_runner_(target_task_runner), |
53 current_overscroll_params_(NULL) { | 53 current_overscroll_params_(NULL), |
| 54 is_flinging_on_main_(false), |
| 55 is_flinging_on_impl_(false) { |
54 DCHECK(target_task_runner_.get()); | 56 DCHECK(target_task_runner_.get()); |
55 } | 57 } |
56 | 58 |
57 void InputEventFilter::SetBoundHandler(const Handler& handler) { | 59 void InputEventFilter::SetBoundHandler(const Handler& handler) { |
58 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 60 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
59 handler_ = handler; | 61 handler_ = handler; |
60 } | 62 } |
61 | 63 |
62 void InputEventFilter::DidAddInputHandler(int routing_id) { | 64 void InputEventFilter::DidAddInputHandler(int routing_id) { |
63 base::AutoLock locked(routes_lock_); | 65 base::AutoLock locked(routes_lock_); |
(...skipping 12 matching lines...) Expand all Loading... |
76 if (current_overscroll_params_) { | 78 if (current_overscroll_params_) { |
77 current_overscroll_params_->reset(new DidOverscrollParams(params)); | 79 current_overscroll_params_->reset(new DidOverscrollParams(params)); |
78 return; | 80 return; |
79 } | 81 } |
80 | 82 |
81 SendMessage(std::unique_ptr<IPC::Message>( | 83 SendMessage(std::unique_ptr<IPC::Message>( |
82 new InputHostMsg_DidOverscroll(routing_id, params))); | 84 new InputHostMsg_DidOverscroll(routing_id, params))); |
83 } | 85 } |
84 | 86 |
85 void InputEventFilter::DidStopFlinging(int routing_id) { | 87 void InputEventFilter::DidStopFlinging(int routing_id) { |
| 88 is_flinging_on_main_ = false; |
| 89 is_flinging_on_impl_ = false; |
86 SendMessage(base::WrapUnique(new InputHostMsg_DidStopFlinging(routing_id))); | 90 SendMessage(base::WrapUnique(new InputHostMsg_DidStopFlinging(routing_id))); |
87 } | 91 } |
88 | 92 |
| 93 void InputEventFilter::DidStartFlinging(bool is_on_impl) { |
| 94 if (is_on_impl) |
| 95 is_flinging_on_impl_ = true; |
| 96 else |
| 97 is_flinging_on_main_ = true; |
| 98 } |
| 99 |
89 void InputEventFilter::NotifyInputEventHandled( | 100 void InputEventFilter::NotifyInputEventHandled( |
90 int routing_id, | 101 int routing_id, |
91 blink::WebInputEvent::Type type) { | 102 blink::WebInputEvent::Type type) { |
92 DCHECK(target_task_runner_->BelongsToCurrentThread()); | 103 DCHECK(target_task_runner_->BelongsToCurrentThread()); |
93 RouteQueueMap::iterator iter = route_queues_.find(routing_id); | 104 RouteQueueMap::iterator iter = route_queues_.find(routing_id); |
94 if (iter == route_queues_.end() || !iter->second) | 105 if (iter == route_queues_.end() || !iter->second) |
95 return; | 106 return; |
96 | 107 |
97 iter->second->EventHandled(type); | 108 iter->second->EventHandled(type); |
98 } | 109 } |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 auto_reset_current_overscroll_params( | 187 auto_reset_current_overscroll_params( |
177 ¤t_overscroll_params_, send_ack ? &overscroll_params : NULL); | 188 ¤t_overscroll_params_, send_ack ? &overscroll_params : NULL); |
178 | 189 |
179 InputEventAckState ack_state = handler_.Run(routing_id, event, &latency_info); | 190 InputEventAckState ack_state = handler_.Run(routing_id, event, &latency_info); |
180 | 191 |
181 if (ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING || | 192 if (ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING || |
182 ack_state == INPUT_EVENT_ACK_STATE_NOT_CONSUMED) { | 193 ack_state == INPUT_EVENT_ACK_STATE_NOT_CONSUMED) { |
183 DCHECK(!overscroll_params); | 194 DCHECK(!overscroll_params); |
184 RouteQueueMap::iterator iter = route_queues_.find(routing_id); | 195 RouteQueueMap::iterator iter = route_queues_.find(routing_id); |
185 if (iter != route_queues_.end()) | 196 if (iter != route_queues_.end()) |
186 send_ack &= iter->second->HandleEvent(event, latency_info, dispatch_type, | 197 send_ack &= iter->second->HandleEvent( |
187 ack_state); | 198 event, latency_info, dispatch_type, ack_state, |
| 199 (is_flinging_on_main_ || is_flinging_on_impl_)); |
188 } | 200 } |
189 | 201 |
190 if (!send_ack) | 202 if (!send_ack) |
191 return; | 203 return; |
192 | 204 |
193 InputEventAck ack(event->type, ack_state, latency_info, | 205 InputEventAck ack(event->type, ack_state, latency_info, |
194 std::move(overscroll_params), | 206 std::move(overscroll_params), |
195 WebInputEventTraits::GetUniqueTouchEventId(*event)); | 207 WebInputEventTraits::GetUniqueTouchEventId(*event)); |
196 SendMessage(std::unique_ptr<IPC::Message>( | 208 SendMessage(std::unique_ptr<IPC::Message>( |
197 new InputHostMsg_HandleInputEvent_ACK(routing_id, ack))); | 209 new InputHostMsg_HandleInputEvent_ACK(routing_id, ack))); |
(...skipping 24 matching lines...) Expand all Loading... |
222 InputEventDispatchType dispatch_type) { | 234 InputEventDispatchType dispatch_type) { |
223 TRACE_EVENT_INSTANT0( | 235 TRACE_EVENT_INSTANT0( |
224 "input", "InputEventFilter::ForwardToHandler::SendEventToMainThread", | 236 "input", "InputEventFilter::ForwardToHandler::SendEventToMainThread", |
225 TRACE_EVENT_SCOPE_THREAD); | 237 TRACE_EVENT_SCOPE_THREAD); |
226 IPC::Message new_msg = | 238 IPC::Message new_msg = |
227 InputMsg_HandleInputEvent(routing_id, event, latency_info, dispatch_type); | 239 InputMsg_HandleInputEvent(routing_id, event, latency_info, dispatch_type); |
228 main_task_runner_->PostTask(FROM_HERE, base::Bind(main_listener_, new_msg)); | 240 main_task_runner_->PostTask(FROM_HERE, base::Bind(main_listener_, new_msg)); |
229 } | 241 } |
230 | 242 |
231 } // namespace content | 243 } // namespace content |
OLD | NEW |