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

Unified Diff: content/renderer/input/input_event_filter.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/input/input_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/input/input_event_filter.cc
diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc
index b93719dc209a5323e6eb201aed1407889f6765e1..c76bbaf383ad239fd79ec0832ad638f290e05c3b 100644
--- a/content/renderer/input/input_event_filter.cc
+++ b/content/renderer/input/input_event_filter.cc
@@ -14,13 +14,13 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/trace_event/trace_event.h"
-#include "content/common/input/web_input_event_traits.h"
#include "content/common/input_messages.h"
#include "content/common/view_messages.h"
#include "content/public/common/content_switches.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_sender.h"
#include "ui/events/blink/did_overscroll_params.h"
+#include "ui/events/blink/web_input_event_traits.h"
#include "ui/gfx/geometry/vector2d_f.h"
using blink::WebInputEvent;
@@ -182,7 +182,8 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) {
InputMsg_HandleInputEvent::Param params;
if (!InputMsg_HandleInputEvent::Read(&message, &params))
return;
- ScopedWebInputEvent event = WebInputEventTraits::Clone(*std::get<0>(params));
+ ui::ScopedWebInputEvent event =
+ ui::WebInputEventTraits::Clone(*std::get<0>(params));
ui::LatencyInfo latency_info = std::get<1>(params);
InputEventDispatchType dispatch_type = std::get<2>(params);
DCHECK(event);
@@ -202,7 +203,7 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) {
handler_.Run(routing_id, event.get(), &latency_info);
uint32_t unique_touch_event_id =
- WebInputEventTraits::GetUniqueTouchEventId(*event);
+ ui::WebInputEventTraits::GetUniqueTouchEventId(*event);
WebInputEvent::Type type = event->type;
if (ack_state == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING ||
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/input/input_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698