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

Unified Diff: ui/events/event.cc

Issue 1680613002: Adding momentum/overscroll to views:: ScrollViews Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Tableview layout. aaaand I think we are done Created 4 years, 5 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.h ('k') | ui/events/event_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event.cc
diff --git a/ui/events/event.cc b/ui/events/event.cc
index 978d30581a3e3614cbd9df2dbe2fc629f4a74f7e..24cfb59647d842e6a3d7423f5eddc9e2f8178dcd 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -1228,12 +1228,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_(EM_PHASE_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 »

Powered by Google App Engine
This is Rietveld 408576698