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_(false) { |
54 DCHECK(target_task_runner_.get()); | 55 DCHECK(target_task_runner_.get()); |
55 } | 56 } |
56 | 57 |
57 void InputEventFilter::SetBoundHandler(const Handler& handler) { | 58 void InputEventFilter::SetBoundHandler(const Handler& handler) { |
58 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 59 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
59 handler_ = handler; | 60 handler_ = handler; |
60 } | 61 } |
61 | 62 |
62 void InputEventFilter::DidAddInputHandler(int routing_id) { | 63 void InputEventFilter::DidAddInputHandler(int routing_id) { |
63 base::AutoLock locked(routes_lock_); | 64 base::AutoLock locked(routes_lock_); |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 ¤t_overscroll_params_, send_ack ? &overscroll_params : NULL); | 178 ¤t_overscroll_params_, send_ack ? &overscroll_params : NULL); |
178 | 179 |
179 InputEventAckState ack_state = handler_.Run(routing_id, event, &latency_info); | 180 InputEventAckState ack_state = handler_.Run(routing_id, event, &latency_info); |
180 | 181 |
181 if (ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING || | 182 if (ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING || |
182 ack_state == INPUT_EVENT_ACK_STATE_NOT_CONSUMED) { | 183 ack_state == INPUT_EVENT_ACK_STATE_NOT_CONSUMED) { |
183 DCHECK(!overscroll_params); | 184 DCHECK(!overscroll_params); |
184 RouteQueueMap::iterator iter = route_queues_.find(routing_id); | 185 RouteQueueMap::iterator iter = route_queues_.find(routing_id); |
185 if (iter != route_queues_.end()) | 186 if (iter != route_queues_.end()) |
186 send_ack &= iter->second->HandleEvent(event, latency_info, dispatch_type, | 187 send_ack &= iter->second->HandleEvent(event, latency_info, dispatch_type, |
187 ack_state); | 188 ack_state, is_flinging_); |
188 } | 189 } |
189 | 190 |
190 if (!send_ack) | 191 if (!send_ack) |
191 return; | 192 return; |
192 | 193 |
193 InputEventAck ack(event->type, ack_state, latency_info, | 194 InputEventAck ack(event->type, ack_state, latency_info, |
194 std::move(overscroll_params), | 195 std::move(overscroll_params), |
195 WebInputEventTraits::GetUniqueTouchEventId(*event)); | 196 WebInputEventTraits::GetUniqueTouchEventId(*event)); |
196 SendMessage(std::unique_ptr<IPC::Message>( | 197 SendMessage(std::unique_ptr<IPC::Message>( |
197 new InputHostMsg_HandleInputEvent_ACK(routing_id, ack))); | 198 new InputHostMsg_HandleInputEvent_ACK(routing_id, ack))); |
(...skipping 23 matching lines...) Expand all Loading... |
221 const ui::LatencyInfo& latency_info, | 222 const ui::LatencyInfo& latency_info, |
222 InputEventDispatchType dispatch_type) { | 223 InputEventDispatchType dispatch_type) { |
223 TRACE_EVENT_INSTANT0( | 224 TRACE_EVENT_INSTANT0( |
224 "input", "InputEventFilter::ForwardToHandler::SendEventToMainThread", | 225 "input", "InputEventFilter::ForwardToHandler::SendEventToMainThread", |
225 TRACE_EVENT_SCOPE_THREAD); | 226 TRACE_EVENT_SCOPE_THREAD); |
226 IPC::Message new_msg = | 227 IPC::Message new_msg = |
227 InputMsg_HandleInputEvent(routing_id, event, latency_info, dispatch_type); | 228 InputMsg_HandleInputEvent(routing_id, event, latency_info, dispatch_type); |
228 main_task_runner_->PostTask(FROM_HERE, base::Bind(main_listener_, new_msg)); | 229 main_task_runner_->PostTask(FROM_HERE, base::Bind(main_listener_, new_msg)); |
229 } | 230 } |
230 | 231 |
| 232 void InputEventFilter::SetIsFlinging(bool is_flinging) { |
| 233 is_flinging_ = is_flinging; |
| 234 } |
| 235 |
231 } // namespace content | 236 } // namespace content |
OLD | NEW |