| 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,
|
|
|