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

Unified Diff: content/renderer/input/input_handler_manager.cc

Issue 1415953004: Move content/renderer input handling for web input events to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/input/input_event_filter.cc ('k') | content/renderer/input/input_handler_manager_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/input/input_handler_manager.cc
diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
index cbc9a15435cddb908fc5a436a8a5e6a20137668d..85f229d27cddadd4c1b867f5a4959454e0edb649 100644
--- a/content/renderer/input/input_handler_manager.cc
+++ b/content/renderer/input/input_handler_manager.cc
@@ -11,12 +11,14 @@
#include "base/trace_event/trace_event.h"
#include "cc/input/input_handler.h"
#include "components/scheduler/renderer/renderer_scheduler.h"
+#include "content/common/input/web_input_event_traits.h"
#include "content/renderer/input/input_event_filter.h"
#include "content/renderer/input/input_handler_manager_client.h"
#include "content/renderer/input/input_handler_wrapper.h"
-#include "content/renderer/input/input_scroll_elasticity_controller.h"
+#include "ui/events/blink/input_handler_proxy.h"
using blink::WebInputEvent;
+using ui::InputHandlerProxy;
using scheduler::RendererScheduler;
namespace content {
@@ -137,6 +139,8 @@ InputEventAckState InputHandlerManager::HandleInputEvent(
const WebInputEvent* input_event,
ui::LatencyInfo* latency_info) {
DCHECK(task_runner_->BelongsToCurrentThread());
+ TRACE_EVENT1("input,benchmark", "InputHandlerManager::HandleInputEvent",
+ "type", WebInputEventTraits::GetName(input_event->type));
auto it = input_handlers_.find(routing_id);
if (it == input_handlers_.end()) {
@@ -146,6 +150,8 @@ InputEventAckState InputHandlerManager::HandleInputEvent(
return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
}
+ TRACE_EVENT1("input", "InputHandlerManager::HandleInputEvent",
+ "result", "EventSentToInputHandlerProxy");
InputHandlerProxy* proxy = it->second->input_handler_proxy();
InputEventAckState input_event_ack_state = InputEventDispositionToAck(
proxy->HandleInputEventWithLatencyInfo(*input_event, latency_info));
« no previous file with comments | « content/renderer/input/input_event_filter.cc ('k') | content/renderer/input/input_handler_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698