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

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

Issue 300863002: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 6 years, 7 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 5afb35d3ee61214ba6724785ebde7a2d0158b34e..9b0659ebed30fe9c871d9e7ff355281f71567199 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1869,10 +1869,11 @@ void RenderWidgetHostImpl::OnWheelEventAck(
ui::INPUT_EVENT_LATENCY_TERMINATED_MOUSE_COMPONENT, 0, 0);
}
- const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
- if (!processed && !is_hidden() && view_) {
- if (!delegate_->HandleWheelEvent(wheel_event.event))
- view_->UnhandledWheelEvent(wheel_event.event);
+ bool consumed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
+ if (!is_hidden() && view_) {
+ if (!consumed)
+ consumed = delegate_->HandleWheelEvent(wheel_event.event);
+ view_->ProcessedWheelEvent(wheel_event.event, consumed);
}
}

Powered by Google App Engine
This is Rietveld 408576698