| Index: ui/events/gestures/motion_event_aura.cc
|
| diff --git a/ui/events/gestures/motion_event_aura.cc b/ui/events/gestures/motion_event_aura.cc
|
| index ab20860e1ddae6701669e924fcef57a023d848e1..c1c144653d10a73538c56cf4091f49deb1257a65 100644
|
| --- a/ui/events/gestures/motion_event_aura.cc
|
| +++ b/ui/events/gestures/motion_event_aura.cc
|
| @@ -13,12 +13,11 @@ MotionEventAura::MotionEventAura()
|
| : pointer_count_(0), cached_action_index_(-1) {
|
| }
|
|
|
| -MotionEventAura::MotionEventAura(
|
| - size_t pointer_count,
|
| - const base::TimeTicks& last_touch_time,
|
| - Action cached_action,
|
| - int cached_action_index,
|
| - const PointData (&active_touches)[GestureSequence::kMaxGesturePoints])
|
| +MotionEventAura::MotionEventAura(size_t pointer_count,
|
| + const base::TimeTicks& last_touch_time,
|
| + Action cached_action,
|
| + int cached_action_index,
|
| + const PointData (&active_touches)[10/*TODO*/])
|
| : pointer_count_(pointer_count),
|
| last_touch_time_(last_touch_time),
|
| cached_action_(cached_action),
|
| @@ -181,7 +180,7 @@ int MotionEventAura::GetSourceDeviceId(size_t pointer_index) const {
|
| }
|
|
|
| void MotionEventAura::AddTouch(const TouchEvent& touch) {
|
| - if (pointer_count_ == static_cast<size_t>(GestureSequence::kMaxGesturePoints))
|
| + if (pointer_count_ == MotionEvent::MAX_TOUCH_POINT_COUNT)
|
| return;
|
|
|
| active_touches_[pointer_count_] = GetPointDataFromTouchEvent(touch);
|
|
|