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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 2394593002: revert "SourceEventType added to LatencyInfo." (Closed)
Patch Set: Created 4 years, 2 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/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index ee509443c1837a633ca65b0c34900296a7122fec..bf2852c61d4899f3179f3859ee1b58dc8f4e5967 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -1873,14 +1873,14 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
WebMouseEvent enterEvent = WebMouseEventBuilder::Build(theEvent, self);
enterEvent.type = WebInputEvent::MouseMove;
enterEvent.button = WebMouseEvent::Button::NoButton;
- ui::LatencyInfo latency_info(ui::SourceEventType::OTHER);
- latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
if (renderWidgetHostView_->ShouldRouteEvent(enterEvent)) {
renderWidgetHostView_->render_widget_host_->delegate()
->GetInputEventRouter()
- ->RouteMouseEvent(renderWidgetHostView_.get(), &enterEvent,
- latency_info);
+ ->RouteMouseEvent(renderWidgetHostView_.get(), &enterEvent);
} else {
+ ui::LatencyInfo latency_info;
+ latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT,
+ 0, 0);
renderWidgetHostView_->ProcessMouseEvent(enterEvent, latency_info);
}
}
@@ -1911,13 +1911,13 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
}
WebMouseEvent event = WebMouseEventBuilder::Build(theEvent, self);
- ui::LatencyInfo latency_info(ui::SourceEventType::OTHER);
- latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
if (renderWidgetHostView_->ShouldRouteEvent(event)) {
renderWidgetHostView_->render_widget_host_->delegate()
->GetInputEventRouter()
- ->RouteMouseEvent(renderWidgetHostView_.get(), &event, latency_info);
+ ->RouteMouseEvent(renderWidgetHostView_.get(), &event);
} else {
+ ui::LatencyInfo latency_info;
+ latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
renderWidgetHostView_->ProcessMouseEvent(event, latency_info);
}
}
@@ -2248,7 +2248,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
WebMouseWheelEvent webEvent = WebMouseWheelEventBuilder::Build(
event, self);
webEvent.railsMode = mouseWheelFilter_.UpdateRailsMode(webEvent);
- ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
+ ui::LatencyInfo latency_info;
latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
renderWidgetHostView_->render_widget_host_->
ForwardWheelEventWithLatencyInfo(webEvent, latency_info);
@@ -2447,14 +2447,13 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
if (renderWidgetHostView_->render_widget_host_) {
WebMouseWheelEvent webEvent = WebMouseWheelEventBuilder::Build(event, self);
webEvent.railsMode = mouseWheelFilter_.UpdateRailsMode(webEvent);
- ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
- latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
if (renderWidgetHostView_->ShouldRouteEvent(webEvent)) {
renderWidgetHostView_->render_widget_host_->delegate()
->GetInputEventRouter()
- ->RouteMouseWheelEvent(renderWidgetHostView_.get(), &webEvent,
- latency_info);
+ ->RouteMouseWheelEvent(renderWidgetHostView_.get(), &webEvent);
} else {
+ ui::LatencyInfo latency_info;
+ latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
renderWidgetHostView_->ProcessMouseWheelEvent(webEvent, latency_info);
}
}

Powered by Google App Engine
This is Rietveld 408576698