Chromium Code Reviews| Index: ui/events/gesture_event_details.cc |
| diff --git a/ui/events/gesture_event_details.cc b/ui/events/gesture_event_details.cc |
| index 3f478e5aaabce15848e5b1fe6f733e689ad9e994..9bfbe7c8c6918c9b18649b1dc6a5e4e5667fc2f7 100644 |
| --- a/ui/events/gesture_event_details.cc |
| +++ b/ui/events/gesture_event_details.cc |
| @@ -10,6 +10,12 @@ GestureEventDetails::GestureEventDetails() |
| : type_(ET_UNKNOWN), touch_points_(0), oldest_touch_id_(-1) { |
| } |
| +GestureEventDetails::GestureEventDetails(ui::EventType type) |
| + : type_(type), touch_points_(1), oldest_touch_id_(0) { |
| + DCHECK_GE(type, ET_GESTURE_TYPE_START); |
| + DCHECK_LE(type, ET_GESTURE_TYPE_END); |
|
tdresser
2014/09/12 12:35:27
I think it would be worth DCHECKING that this isn'
|
| +} |
| + |
| GestureEventDetails::GestureEventDetails(ui::EventType type, |
| float delta_x, |
| float delta_y) |
| @@ -37,11 +43,6 @@ GestureEventDetails::GestureEventDetails(ui::EventType type, |
| data.first_finger_enclosing_rectangle.height = delta_y; |
| break; |
| - case ui::ET_GESTURE_PINCH_UPDATE: |
| - data.scale = delta_x; |
| - CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for pinch"; |
| - break; |
| - |
| case ui::ET_GESTURE_SWIPE: |
| data.swipe.left = delta_x < 0; |
| data.swipe.right = delta_x > 0; |
| @@ -49,19 +50,8 @@ GestureEventDetails::GestureEventDetails(ui::EventType type, |
| data.swipe.down = delta_y > 0; |
| break; |
| - case ui::ET_GESTURE_TAP: |
| - case ui::ET_GESTURE_DOUBLE_TAP: |
| - case ui::ET_GESTURE_TAP_UNCONFIRMED: |
| - data.tap_count = static_cast<int>(delta_x); |
| - CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for tap."; |
| - break; |
| - |
| default: |
| - if (delta_x != 0.f || delta_y != 0.f) { |
| - DLOG(WARNING) << "A gesture event (" << type << ") had unknown data: (" |
| - << delta_x << "," << delta_y; |
| - } |
| - break; |
| + NOTREACHED(); |
| } |
| } |