Chromium Code Reviews| 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 771b67f0990f8f254ccd4d783da09538b942cb4e..708032fb9713b1f9c373f921cadf6cf6f83270ad 100644 |
| --- a/ui/events/gestures/motion_event_aura.cc |
| +++ b/ui/events/gestures/motion_event_aura.cc |
| @@ -5,6 +5,7 @@ |
| #include "ui/events/gestures/motion_event_aura.h" |
| #include "base/logging.h" |
| +#include "third_party/WebKit/public/web/WebInputEvent.h" |
|
tdresser
2014/08/16 00:31:47
This is a layering violation. I'm still not sure w
|
| #include "ui/events/gestures/gesture_configuration.h" |
| namespace ui { |
| @@ -13,12 +14,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), |
| @@ -180,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_ == blink::WebTouchEvent::touchesLengthCap) |
| return; |
| active_touches_[pointer_count_] = GetPointDataFromTouchEvent(touch); |