| Index: ui/base/gestures/gesture_sequence.cc
|
| diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc
|
| index 7105aa9f144400d7bf4c16b65f53354cd1c9fb2f..93d439f2de979abd29fc17e1727b24861e517ec0 100644
|
| --- a/ui/base/gestures/gesture_sequence.cc
|
| +++ b/ui/base/gestures/gesture_sequence.cc
|
| @@ -310,7 +310,7 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
|
| EventResult result) {
|
| StopLongPressTimerIfRequired(event);
|
| last_touch_location_ = event.location();
|
| - if (result & ER_ASYNC)
|
| + if (result & ER_CONSUMED)
|
| return NULL;
|
|
|
| // Set a limit on the number of simultaneous touches in a gesture.
|
| @@ -350,7 +350,6 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
|
| if (event.type() == ui::ET_TOUCH_PRESSED)
|
| AppendBeginGestureEvent(point, gestures.get());
|
|
|
| - CHECK_NE(ER_ASYNC, result);
|
| TouchStatusInternal status_internal = (result == ER_UNHANDLED) ?
|
| TSI_NOT_PROCESSED : TSI_PROCESSED;
|
|
|
|
|