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

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: Merge with trunk (no changes) 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 b827c143cf3d8d4ba4161dd1cd5964fdc6b0993e..c715fcac51e35b0b9e381cd686dd1453f7b7ecc8 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -973,9 +973,6 @@ void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
if (IgnoreInputEvents())
return;
- if (delegate_->PreHandleWheelEvent(wheel_event))
- return;
-
input_router_->SendWheelEvent(MouseWheelEventWithLatencyInfo(wheel_event,
latency_info));
}
@@ -2062,8 +2059,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