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

Unified Diff: content/renderer/mus/compositor_mus_connection.cc

Issue 2576013002: Introducing WebCoalescedInputEvent and inclusion in content/common (Closed)
Patch Set: Fix a few DCHECK hits Created 3 years, 11 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
Index: content/renderer/mus/compositor_mus_connection.cc
diff --git a/content/renderer/mus/compositor_mus_connection.cc b/content/renderer/mus/compositor_mus_connection.cc
index 1ffb713f6175b628d5923c8d81fb9f82dc758321..931ac994330b8db65fcd921a5416b1f066960274 100644
--- a/content/renderer/mus/compositor_mus_connection.cc
+++ b/content/renderer/mus/compositor_mus_connection.cc
@@ -96,7 +96,7 @@ void CompositorMusConnection::OnConnectionLostOnMainThread() {
}
void CompositorMusConnection::OnWindowInputEventOnMainThread(
- ui::ScopedWebInputEvent web_event,
+ blink::WebScopedInputEvent web_event,
const base::Callback<void(EventResult)>& ack) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
RenderWidgetMusConnection* connection =
@@ -187,7 +187,7 @@ void CompositorMusConnection::OnWindowInputEvent(
// Take ownership of the callback, indicating that we will handle it.
std::unique_ptr<base::Callback<void(EventResult)>> callback =
std::move(*ack_callback);
- ui::ScopedWebInputEvent web_event(Convert(event).release());
+ blink::WebScopedInputEvent web_event(Convert(event).release());
// TODO(sad): We probably need to plumb LatencyInfo through Mus.
ui::LatencyInfo info;
input_handler_manager_->HandleInputEvent(
@@ -200,7 +200,7 @@ void CompositorMusConnection::OnWindowInputEvent(
void CompositorMusConnection::DidHandleWindowInputEventAndOverscroll(
std::unique_ptr<base::Callback<void(EventResult)>> ack_callback,
InputEventAckState ack_state,
- ui::ScopedWebInputEvent web_event,
+ blink::WebScopedInputEvent web_event,
const ui::LatencyInfo& latency_info,
std::unique_ptr<ui::DidOverscrollParams> overscroll_params) {
// TODO(jonross): We probably need to ack the event based on the consumed

Powered by Google App Engine
This is Rietveld 408576698