Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(754)

Side by Side Diff: content/renderer/input/input_handler_manager.cc

Issue 2240983003: Move |ScopedWebInputEvent| and |WebInputEventTraits| from |content::| to "ui/events/blink" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and ncarter's review Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/threading/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
13 #include "base/trace_event/trace_event.h" 13 #include "base/trace_event/trace_event.h"
14 #include "cc/input/input_handler.h" 14 #include "cc/input/input_handler.h"
15 #include "content/common/input/web_input_event_traits.h"
16 #include "content/renderer/input/input_event_filter.h" 15 #include "content/renderer/input/input_event_filter.h"
17 #include "content/renderer/input/input_handler_manager_client.h" 16 #include "content/renderer/input/input_handler_manager_client.h"
18 #include "content/renderer/input/input_handler_wrapper.h" 17 #include "content/renderer/input/input_handler_wrapper.h"
19 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_schedul er.h" 18 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_schedul er.h"
20 #include "ui/events/blink/did_overscroll_params.h" 19 #include "ui/events/blink/did_overscroll_params.h"
21 #include "ui/events/blink/input_handler_proxy.h" 20 #include "ui/events/blink/input_handler_proxy.h"
21 #include "ui/events/blink/web_input_event_traits.h"
22 22
23 using blink::WebInputEvent; 23 using blink::WebInputEvent;
24 using ui::InputHandlerProxy; 24 using ui::InputHandlerProxy;
25 using blink::scheduler::RendererScheduler; 25 using blink::scheduler::RendererScheduler;
26 26
27 namespace content { 27 namespace content {
28 28
29 namespace { 29 namespace {
30 30
31 InputEventAckState InputEventDispositionToAck( 31 InputEventAckState InputEventDispositionToAck(
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 InputEventAckState ack_result) { 192 InputEventAckState ack_result) {
193 client_->NotifyInputEventHandled(routing_id, type, ack_result); 193 client_->NotifyInputEventHandled(routing_id, type, ack_result);
194 } 194 }
195 195
196 InputEventAckState InputHandlerManager::HandleInputEvent( 196 InputEventAckState InputHandlerManager::HandleInputEvent(
197 int routing_id, 197 int routing_id,
198 const WebInputEvent* input_event, 198 const WebInputEvent* input_event,
199 ui::LatencyInfo* latency_info) { 199 ui::LatencyInfo* latency_info) {
200 DCHECK(task_runner_->BelongsToCurrentThread()); 200 DCHECK(task_runner_->BelongsToCurrentThread());
201 TRACE_EVENT1("input,benchmark,rail", "InputHandlerManager::HandleInputEvent", 201 TRACE_EVENT1("input,benchmark,rail", "InputHandlerManager::HandleInputEvent",
202 "type", WebInputEventTraits::GetName(input_event->type)); 202 "type", ui::WebInputEventTraits::GetName(input_event->type));
203 203
204 auto it = input_handlers_.find(routing_id); 204 auto it = input_handlers_.find(routing_id);
205 if (it == input_handlers_.end()) { 205 if (it == input_handlers_.end()) {
206 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent", 206 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent",
207 "result", "NoInputHandlerFound"); 207 "result", "NoInputHandlerFound");
208 // Oops, we no longer have an interested input handler.. 208 // Oops, we no longer have an interested input handler..
209 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 209 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
210 } 210 }
211 211
212 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent", 212 TRACE_EVENT1("input,rail", "InputHandlerManager::HandleInputEvent",
(...skipping 29 matching lines...) Expand all
242 242
243 void InputHandlerManager::DidStopFlinging(int routing_id) { 243 void InputHandlerManager::DidStopFlinging(int routing_id) {
244 client_->DidStopFlinging(routing_id); 244 client_->DidStopFlinging(routing_id);
245 } 245 }
246 246
247 void InputHandlerManager::DidAnimateForInput() { 247 void InputHandlerManager::DidAnimateForInput() {
248 renderer_scheduler_->DidAnimateForInputOnCompositorThread(); 248 renderer_scheduler_->DidAnimateForInputOnCompositorThread();
249 } 249 }
250 250
251 } // namespace content 251 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/input/input_event_filter_unittest.cc ('k') | content/renderer/input/main_thread_event_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698