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_handler_manager.h" | 5 #include "content/renderer/input/input_handler_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
11 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
12 #include "cc/input/input_handler.h" | 12 #include "cc/input/input_handler.h" |
13 #include "components/scheduler/renderer/renderer_scheduler.h" | 13 #include "components/scheduler/renderer/renderer_scheduler.h" |
14 #include "content/renderer/input/input_event_filter.h" | 14 #include "content/renderer/input/input_event_filter.h" |
15 #include "content/renderer/input/input_handler_manager_client.h" | 15 #include "content/renderer/input/input_handler_manager_client.h" |
16 #include "content/renderer/input/input_handler_wrapper.h" | 16 #include "content/renderer/input/input_handler_wrapper.h" |
17 #include "content/renderer/input/input_scroll_elasticity_controller.h" | 17 #include "ui/events/blink/input_handler_proxy.h" |
18 | 18 |
19 using blink::WebInputEvent; | 19 using blink::WebInputEvent; |
| 20 using ui::InputHandlerProxy; |
20 using scheduler::RendererScheduler; | 21 using scheduler::RendererScheduler; |
21 | 22 |
22 namespace content { | 23 namespace content { |
23 | 24 |
24 namespace { | 25 namespace { |
25 | 26 |
26 InputEventAckState InputEventDispositionToAck( | 27 InputEventAckState InputEventDispositionToAck( |
27 InputHandlerProxy::EventDisposition disposition) { | 28 InputHandlerProxy::EventDisposition disposition) { |
28 switch (disposition) { | 29 switch (disposition) { |
29 case InputHandlerProxy::DID_HANDLE: | 30 case InputHandlerProxy::DID_HANDLE: |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 | 174 |
174 void InputHandlerManager::DidStopFlinging(int routing_id) { | 175 void InputHandlerManager::DidStopFlinging(int routing_id) { |
175 client_->DidStopFlinging(routing_id); | 176 client_->DidStopFlinging(routing_id); |
176 } | 177 } |
177 | 178 |
178 void InputHandlerManager::DidAnimateForInput() { | 179 void InputHandlerManager::DidAnimateForInput() { |
179 renderer_scheduler_->DidAnimateForInputOnCompositorThread(); | 180 renderer_scheduler_->DidAnimateForInputOnCompositorThread(); |
180 } | 181 } |
181 | 182 |
182 } // namespace content | 183 } // namespace content |
OLD | NEW |