Chromium Code Reviews| Index: ui/events/gesture_detection/gesture_event_data_packet.cc |
| diff --git a/ui/events/gesture_detection/gesture_event_data_packet.cc b/ui/events/gesture_detection/gesture_event_data_packet.cc |
| index fd63932db69117e4c7971d9477e60552a22d3a4d..caf6b6be9f75c698cde37c4ad38fbcb119c76212 100644 |
| --- a/ui/events/gesture_detection/gesture_event_data_packet.cc |
| +++ b/ui/events/gesture_detection/gesture_event_data_packet.cc |
| @@ -111,9 +111,13 @@ GestureEventDataPacket GestureEventDataPacket::FromTouchTimeout( |
| return packet; |
| } |
| -void GestureEventDataPacket::Ack(bool event_consumed) { |
| +void GestureEventDataPacket::Ack(EventResult result) { |
| DCHECK_EQ(static_cast<int>(ack_state_), static_cast<int>(AckState::PENDING)); |
| - ack_state_ = event_consumed ? AckState::CONSUMED : AckState::UNCONSUMED; |
| + ack_state_ = (result == ER_UNHANDLED || result == ER_IGNORED_NON_BLOCKING) |
|
dtapuska
2017/05/25 15:40:12
I think these are bit sets.. so comparing them dir
|
| + ? AckState::UNCONSUMED |
| + : AckState::CONSUMED; |
| + for (auto& gesture : gestures_.container()) |
| + gesture.details.set_source_touch_event_result(result); |
| } |
| } // namespace ui |