content/browser/web_contents/web_contents_impl_unittest.cc - Issue 739013008: Explicitly suppress scrolling for wheel events that will trigger zooming

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/web_contents/web_contents_impl_unittest.cc

Issue 739013008: Explicitly suppress scrolling for wheel events that will trigger zooming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add unit tests Created 6 years 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

« content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('K') | « content/browser/web_contents/web_contents_impl.cc ('k') | content/common/input/synthetic_web_input_event_builders.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl_unittest.cc

diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc

index ba1a8f00734c0f34eb5ead8f5146a8ae860aa2e3..79404a581f5e4452eac476d2ef9c31285e6eea69 100644

--- a/content/browser/web_contents/web_contents_impl_unittest.cc

+++ b/content/browser/web_contents/web_contents_impl_unittest.cc

@@ -2485,6 +2485,7 @@ TEST_F(WebContentsImplTest, HandleWheelEvent) {

// Except on MacOS where we never want to adjust zoom with mousewheel.

modifiers = WebInputEvent::ControlKey;

event = SyntheticWebMouseWheelEventBuilder::Build(0, 1, modifiers, false);

+ event.canScroll = false;

bool handled = contents()->HandleWheelEvent(event);

#if defined(OS_MACOSX)

EXPECT_FALSE(handled);

@@ -2498,6 +2499,7 @@ TEST_F(WebContentsImplTest, HandleWheelEvent) {

modifiers = WebInputEvent::ControlKey | WebInputEvent::ShiftKey |

WebInputEvent::AltKey;

event = SyntheticWebMouseWheelEventBuilder::Build(2, -5, modifiers, false);

+ event.canScroll = false;

handled = contents()->HandleWheelEvent(event);

#if defined(OS_MACOSX)

EXPECT_FALSE(handled);