content/browser/renderer_host/render_widget_host_impl.cc - Issue 227043012: mac: History swiping doesn't work right with iframes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 227043012: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Respond to comment from avi. Created 6 years, 8 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 | « chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 285068b5eab3899bc7e2db66f30f2f227bc6365d..f1f3672b53406b27ca4865427569288b893bda8d 100644

--- a/content/browser/renderer_host/render_widget_host_impl.cc

+++ b/content/browser/renderer_host/render_widget_host_impl.cc

@@ -2109,10 +2109,13 @@ 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 the renderer did not consume the event, give the delegate a chance

+ // to consume it.

+ if (!consumed)

+ consumed = delegate_->HandleWheelEvent(wheel_event.event);

+ view_->HandledWheelEvent(wheel_event.event, consumed);

}