content/browser/web_contents/web_contents_impl.cc - Issue 2052663004: Remove canScroll from WebMouseWheelEvent as it is unused now.

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.cc

Issue 2052663004: Remove canScroll from WebMouseWheelEvent as it is unused now. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Really fix android unit test Created 4 years, 6 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 | « content/browser/renderer_host/web_input_event_aura.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

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

index 83f0007ede2c9117eb03fd73b179f287cc14c8f4..d1c00c18b568fb4df9525acb69ea136b85b9f622 100644

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

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

@@ -1739,8 +1739,7 @@ bool WebContentsImpl::HandleWheelEvent(

// (i.e. control+tab) then the OS's buffered scroll events will come in

// with control key set which isn't what the user wants

if (delegate_ && event.wheelTicksY &&

- (event.modifiers & blink::WebInputEvent::ControlKey) &&

- !event.canScroll) {

+ !WebInputEventTraits::CanCauseScroll(event)) {

// Count only integer cumulative scrolls as zoom events; this handles

// smooth scroll and regular scroll device behavior.

zoom_scroll_remainder_ += event.wheelTicksY;