ui/events/event.cc - Issue 2193153002: MacViews: Send Mac scrollWheel NSEvents as ui::ET_SCROLL (ui::ScrollEvent).

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: ui/events/event.cc

Issue 2193153002: MacViews: Send Mac scrollWheel NSEvents as ui::ET_SCROLL (ui::ScrollEvent). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-ScrollLayers

Patch Set: NSDictionary subscripting Created 4 years, 3 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: ui/events/event.cc

diff --git a/ui/events/event.cc b/ui/events/event.cc

index d8608022be2c0927d2f6c9a5d986f48db4cbb941..fbf647a05867d3a25eaf8bd61f861a268584e641 100644

--- a/ui/events/event.cc

+++ b/ui/events/event.cc

@@ -1353,12 +1353,11 @@ ScrollEvent::ScrollEvent(const base::NativeEvent& native_event)

y_offset_(0.0f),

x_offset_ordinal_(0.0f),

y_offset_ordinal_(0.0f),

- finger_count_(0) {

+ finger_count_(0),

+ momentum_phase_(EventMomentumPhase::NONE) {

if (type() == ET_SCROLL) {

- GetScrollOffsets(native_event,

- &x_offset_, &y_offset_,

- &x_offset_ordinal_, &y_offset_ordinal_,

- &finger_count_);

+ GetScrollOffsets(native_event, &x_offset_, &y_offset_, &x_offset_ordinal_,

+ &y_offset_ordinal_, &finger_count_, &momentum_phase_);

} else if (type() == ET_SCROLL_FLING_START ||

type() == ET_SCROLL_FLING_CANCEL) {

GetFlingData(native_event,

« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_constants.h » ('j') | no next file with comments »