diff options
Diffstat (limited to 'chromium/ui/base/gestures/gesture_point.cc')
| -rw-r--r-- | chromium/ui/base/gestures/gesture_point.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/ui/base/gestures/gesture_point.cc b/chromium/ui/base/gestures/gesture_point.cc index 105779b17c2..2233bf11dc1 100644 --- a/chromium/ui/base/gestures/gesture_point.cc +++ b/chromium/ui/base/gestures/gesture_point.cc @@ -7,11 +7,11 @@ #include <cmath> #include "base/basictypes.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/gestures/gesture_util.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" namespace ui { @@ -107,6 +107,8 @@ bool GesturePoint::IsInTripleClickWindow(const TouchEvent& event) const { } bool GesturePoint::IsInScrollWindow(const TouchEvent& event) const { + if (IsConsistentScrollingActionUnderway()) + return true; return event.type() == ui::ET_TOUCH_MOVED && !IsInsideManhattanSquare(event); } @@ -130,7 +132,7 @@ bool GesturePoint::DidScroll(const TouchEvent& event, int dist) const { return abs(d.x()) > dist || abs(d.y()) > dist; } -bool GesturePoint::IsConsistentScrollingActionUnderway() { +bool GesturePoint::IsConsistentScrollingActionUnderway() const { int me = GestureConfiguration::min_scroll_successive_velocity_events(); if (abs(same_direction_count_.x()) >= me || abs(same_direction_count_.y()) >= me) |