Index: ui/events/blink/blink_event_util.cc |
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc |
index 35c307efea919f6e6a9d022a8820bdabad173a56..3039bdd18022a5b862758b026a07fce5903621be 100644 |
--- a/ui/events/blink/blink_event_util.cc |
+++ b/ui/events/blink/blink_event_util.cc |
@@ -53,11 +53,15 @@ WebTouchPoint::State ToWebTouchPointState(const MotionEvent& event, |
case MotionEvent::ACTION_DOWN: |
return WebTouchPoint::StatePressed; |
case MotionEvent::ACTION_MOVE: |
- return WebTouchPoint::StateMoved; |
+ return static_cast<int>(pointer_index) == event.GetActionIndex() |
tdresser
2015/05/04 20:39:37
GetActionIndex is only valid if |GetAction()| retu
|
+ ? WebTouchPoint::StateMoved |
+ : WebTouchPoint::StateStationary; |
case MotionEvent::ACTION_UP: |
return WebTouchPoint::StateReleased; |
case MotionEvent::ACTION_CANCEL: |
- return WebTouchPoint::StateCancelled; |
+ return static_cast<int>(pointer_index) == event.GetActionIndex() |
+ ? WebTouchPoint::StateCancelled |
+ : WebTouchPoint::StateStationary; |
case MotionEvent::ACTION_POINTER_DOWN: |
return static_cast<int>(pointer_index) == event.GetActionIndex() |
? WebTouchPoint::StatePressed |