| Index: ui/events/gesture_event_details.cc
|
| diff --git a/ui/events/gesture_event_details.cc b/ui/events/gesture_event_details.cc
|
| index 389a9249625b7635636b76aee362a3a4b451b399..3d248783a7c0e3201c565cebddb9e5aed46737e0 100644
|
| --- a/ui/events/gesture_event_details.cc
|
| +++ b/ui/events/gesture_event_details.cc
|
| @@ -22,15 +22,11 @@ GestureEventDetails::GestureEventDetails(ui::EventType type,
|
| case ui::ET_GESTURE_SCROLL_UPDATE:
|
| data.scroll_update.x = delta_x;
|
| data.scroll_update.y = delta_y;
|
| - data.scroll_update.x_ordinal = delta_x;
|
| - data.scroll_update.y_ordinal = delta_y;
|
| break;
|
|
|
| case ui::ET_SCROLL_FLING_START:
|
| data.fling_velocity.x = delta_x;
|
| data.fling_velocity.y = delta_y;
|
| - data.fling_velocity.x_ordinal = delta_x;
|
| - data.fling_velocity.y_ordinal = delta_y;
|
| break;
|
|
|
| case ui::ET_GESTURE_TWO_FINGER_TAP:
|
| @@ -66,35 +62,6 @@ GestureEventDetails::GestureEventDetails(ui::EventType type,
|
| }
|
| }
|
|
|
| -GestureEventDetails::GestureEventDetails(ui::EventType type,
|
| - float delta_x,
|
| - float delta_y,
|
| - float delta_x_ordinal,
|
| - float delta_y_ordinal)
|
| - : type_(type),
|
| - touch_points_(1) {
|
| - CHECK(type == ui::ET_GESTURE_SCROLL_UPDATE ||
|
| - type == ui::ET_SCROLL_FLING_START);
|
| - switch (type_) {
|
| - case ui::ET_GESTURE_SCROLL_UPDATE:
|
| - data.scroll_update.x = delta_x;
|
| - data.scroll_update.y = delta_y;
|
| - data.scroll_update.x_ordinal = delta_x_ordinal;
|
| - data.scroll_update.y_ordinal = delta_y_ordinal;
|
| - break;
|
| -
|
| - case ui::ET_SCROLL_FLING_START:
|
| - data.fling_velocity.x = delta_x;
|
| - data.fling_velocity.y = delta_y;
|
| - data.fling_velocity.x_ordinal = delta_x_ordinal;
|
| - data.fling_velocity.y_ordinal = delta_y_ordinal;
|
| - break;
|
| -
|
| - default:
|
| - break;
|
| - }
|
| -}
|
| -
|
| GestureEventDetails::Details::Details() {
|
| memset(this, 0, sizeof(Details));
|
| }
|
|
|