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

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

Issue 169093002: Scroll zooming Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 67b3b1f22844cb16cf2282da6a2dd40c59bca25f..5e9d447bb41cbaab7ec3c21d26215ed404b517e5 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -988,8 +988,6 @@ void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
if (IgnoreInputEvents())
return;
- if (delegate_->PreHandleWheelEvent(wheel_event.event))
- return;
input_router_->SendWheelEvent(wheel_event);
}
@@ -2043,6 +2041,10 @@ void RenderWidgetHostImpl::OnWheelEventAck(
}
const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
+ if (!processed) {
+ if (delegate_->PreHandleWheelEvent(wheel_event.event))
+ return;
+ }
if (!processed && !is_hidden() && view_)
view_->UnhandledWheelEvent(wheel_event.event);
}
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698