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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 177213016: Give blink a chance to consume ctrl+wheel events before zooming (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add tests Created 6 years, 10 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_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index b4f54df750ac098098d8c0025a0a7bcc2b234e12..f4d671d535504ef49fbb9be63b147c4376c39857 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -972,9 +972,6 @@ void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
if (IgnoreInputEvents())
return;
- if (delegate_->PreHandleWheelEvent(wheel_event))
- return;
-
input_router_->SendWheelEvent(MouseWheelEventWithLatencyInfo(wheel_event,
latency_info));
}
@@ -2053,8 +2050,10 @@ void RenderWidgetHostImpl::OnWheelEventAck(
}
const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
- if (!processed && !is_hidden() && view_)
- view_->UnhandledWheelEvent(wheel_event.event);
+ if (!processed && !is_hidden() && view_) {
+ if (!delegate_->HandleWheelEvent(wheel_event.event))
+ view_->UnhandledWheelEvent(wheel_event.event);
+ }
}
void RenderWidgetHostImpl::OnGestureEventAck(

Powered by Google App Engine
This is Rietveld 408576698