| 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 2461641a36c9e7e77dee0e6589cd0c57e712dd8b..e5f2a9282a1ed01ad84adfe5eb04f2d95217193e 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -1810,14 +1810,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);
|
| + ->RouteMouseEvent(renderWidgetHostView_.get(), &enterEvent,
|
| + latency_info);
|
| } else {
|
| - ui::LatencyInfo latency_info;
|
| - latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT,
|
| - 0, 0);
|
| renderWidgetHostView_->ProcessMouseEvent(enterEvent, latency_info);
|
| }
|
| }
|
| @@ -1848,13 +1848,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);
|
| + ->RouteMouseEvent(renderWidgetHostView_.get(), &event, latency_info);
|
| } else {
|
| - ui::LatencyInfo latency_info;
|
| - latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
|
| renderWidgetHostView_->ProcessMouseEvent(event, latency_info);
|
| }
|
| }
|
| @@ -2185,7 +2185,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
|
| WebMouseWheelEvent webEvent = WebMouseWheelEventBuilder::Build(
|
| event, self);
|
| webEvent.railsMode = mouseWheelFilter_.UpdateRailsMode(webEvent);
|
| - ui::LatencyInfo latency_info;
|
| + ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
|
| latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
|
| renderWidgetHostView_->render_widget_host_->
|
| ForwardWheelEventWithLatencyInfo(webEvent, latency_info);
|
| @@ -2356,13 +2356,14 @@ 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);
|
| + ->RouteMouseWheelEvent(renderWidgetHostView_.get(), &webEvent,
|
| + latency_info);
|
| } else {
|
| - ui::LatencyInfo latency_info;
|
| - latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
|
| renderWidgetHostView_->ProcessMouseWheelEvent(webEvent, latency_info);
|
| }
|
| }
|
|
|