content/browser/renderer_host/render_widget_host_unittest.cc - Issue 300863002: 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_unittest.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

« chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm ('K') | « content/browser/renderer_host/render_widget_host_impl.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.h » ('j') | content/browser/renderer_host/render_widget_host_view_mac_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_unittest.cc

diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc

index d50287d75cbe2a41fed2918f592af32641f19ba1..3838687a9cfc2577652dc32cf80c7db43519e794 100644

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

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

@@ -462,9 +462,12 @@ class TestView : public TestRenderWidgetHostView {

acked_event_ = touch.event;

++acked_event_count_;

}

- virtual void UnhandledWheelEvent(const WebMouseWheelEvent& event) OVERRIDE {

- unhandled_wheel_event_count_++;

- unhandled_wheel_event_ = event;

+ virtual void ProcessedWheelEvent(const blink::WebMouseWheelEvent& event,

+ bool consumed) OVERRIDE {

+ if (!consumed) {

+ unhandled_wheel_event_count_++;

+ unhandled_wheel_event_ = event;

+ }

}

virtual void GestureEventAck(const WebGestureEvent& event,

InputEventAckState ack_result) OVERRIDE {