Chromium Code Reviews| 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 86481a97da9b4ab23e3ceb789bcc0e2c0b0063de..7e70e980f4fa5aed587f5a7e5c4c354329e451f0 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
| @@ -1636,14 +1636,14 @@ bool RenderWidgetHostViewMac::ShouldRouteEvent( |
| } |
| void RenderWidgetHostViewMac::ProcessMouseEvent( |
| - const blink::WebMouseEvent& event) { |
| - render_widget_host_->ForwardMouseEvent(event); |
| + const blink::WebMouseEvent& event, |
| + const ui::LatencyInfo& latency) { |
| + render_widget_host_->ForwardMouseEventWithLatencyInfo(event, latency); |
| } |
| void RenderWidgetHostViewMac::ProcessMouseWheelEvent( |
| - const blink::WebMouseWheelEvent& event) { |
| - ui::LatencyInfo latency_info; |
| - latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0); |
| - render_widget_host_->ForwardWheelEventWithLatencyInfo(event, latency_info); |
| + const blink::WebMouseWheelEvent& event, |
| + const ui::LatencyInfo& latency) { |
| + render_widget_host_->ForwardWheelEventWithLatencyInfo(event, latency); |
| } |
| void RenderWidgetHostViewMac::ProcessTouchEvent( |
| @@ -1994,7 +1994,10 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged( |
| ->GetInputEventRouter() |
| ->RouteMouseEvent(renderWidgetHostView_.get(), &enterEvent); |
| } else { |
| - renderWidgetHostView_->ProcessMouseEvent(enterEvent); |
| + ui::LatencyInfo latency_info; |
| + latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, |
| + 0, 0); |
|
tdresser
2016/05/20 17:24:54
Why this change? The change description states tha
sahel
2016/05/20 18:38:20
Adding WheelUI was only for mac but I explained th
tdresser
2016/05/20 18:45:53
Oops, of course, thanks.
|
| + renderWidgetHostView_->ProcessMouseEvent(enterEvent, latency_info); |
| } |
| } |
| } |
| @@ -2029,7 +2032,9 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged( |
| ->GetInputEventRouter() |
| ->RouteMouseEvent(renderWidgetHostView_.get(), &event); |
| } else { |
| - renderWidgetHostView_->ProcessMouseEvent(event); |
| + ui::LatencyInfo latency_info; |
| + latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0); |
| + renderWidgetHostView_->ProcessMouseEvent(event, latency_info); |
| } |
| } |
| @@ -2541,7 +2546,9 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged( |
| ->GetInputEventRouter() |
| ->RouteMouseWheelEvent(renderWidgetHostView_.get(), &webEvent); |
| } else { |
| - renderWidgetHostView_->ProcessMouseWheelEvent(webEvent); |
| + ui::LatencyInfo latency_info; |
| + latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0); |
| + renderWidgetHostView_->ProcessMouseWheelEvent(webEvent, latency_info); |
| } |
| } |
| } |