| 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 709e60ece16d83a59b91be3a576936de8b72ed0d..1165e88a66e1fead854c6de460a31d644dce61d3 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -2054,8 +2054,12 @@ void RenderWidgetHostViewMac::UnlockMouse() {
|
| render_widget_host_->LostMouseLock();
|
| }
|
|
|
| -void RenderWidgetHostViewMac::UnhandledWheelEvent(
|
| - const blink::WebMouseWheelEvent& event) {
|
| +void RenderWidgetHostViewMac::WheelEventAck(
|
| + const blink::WebMouseWheelEvent& event,
|
| + InputEventAckState ack_result) {
|
| + if (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED)
|
| + return;
|
| +
|
| // Only record a wheel event as unhandled if JavaScript handlers got a chance
|
| // to see it (no-op wheel events are ignored by the event dispatcher)
|
| if (event.deltaX || event.deltaY)
|
|
|