Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(862)

Unified Diff: ui/events/events_default.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
« no previous file with comments | « ui/events/event_utils.cc ('k') | ui/events/events_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/events_default.cc
diff --git a/ui/events/events_default.cc b/ui/events/events_default.cc
index 98f3ac934b9778a47b18b1ab3946a8986d33f5a9..6b0f95eaefc03ce56b7b56ea5cfae70879897be6 100644
--- a/ui/events/events_default.cc
+++ b/ui/events/events_default.cc
@@ -114,7 +114,8 @@ bool GetScrollOffsets(const base::NativeEvent& native_event,
float* y_offset,
float* x_offset_ordinal,
float* y_offset_ordinal,
- int* finger_count) {
+ int* finger_count,
+ EventMomentumPhase* momentum_phase) {
const ui::ScrollEvent* event =
static_cast<const ui::ScrollEvent*>(native_event);
DCHECK(event->IsScrollEvent());
@@ -128,6 +129,8 @@ bool GetScrollOffsets(const base::NativeEvent& native_event,
*y_offset_ordinal = event->y_offset_ordinal();
if (finger_count)
*finger_count = event->finger_count();
+ if (momentum_phase)
+ *momentum_phase = event->momentum_phase();
return true;
}
« no previous file with comments | « ui/events/event_utils.cc ('k') | ui/events/events_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698