Remove unclamped delta and velocity values from GestureEventDetails.

Turns out the "ordinal" values in GestureEventDetails are never used.
This patch replaces https://codereview.chromium.org/256593003/.

BUG=332418

Review URL: https://codereview.chromium.org/258803002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266517 0039d316-1c4b-4281-b951-d872f2087c98

ui/aura/gestures/gesture_recognizer_unittest.cc

@@ -93,12 +93,6 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
         scroll_velocity_y_(0),
         velocity_x_(0),
         velocity_y_(0),
-        scroll_x_ordinal_(0),
-        scroll_y_ordinal_(0),
-        scroll_velocity_x_ordinal_(0),
-        scroll_velocity_y_ordinal_(0),
-        velocity_x_ordinal_(0),
-        velocity_y_ordinal_(0),
         scroll_x_hint_(0),
         scroll_y_hint_(0),
         tap_count_(0),
@@ -139,12 +133,6 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
     scroll_velocity_y_ = 0;
     velocity_x_ = 0;
     velocity_y_ = 0;
-    scroll_x_ordinal_ = 0;
-    scroll_y_ordinal_ = 0;
-    scroll_velocity_x_ordinal_ = 0;
-    scroll_velocity_y_ordinal_ = 0;
-    velocity_x_ordinal_ = 0;
-    velocity_y_ordinal_ = 0;
     scroll_x_hint_ = 0;
     scroll_y_hint_ = 0;
     tap_count_ = 0;
@@ -192,12 +180,6 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
   float scroll_velocity_y() const { return scroll_velocity_y_; }
   float velocity_x() const { return velocity_x_; }
   float velocity_y() const { return velocity_y_; }
-  float scroll_x_ordinal() const { return scroll_x_ordinal_; }
-  float scroll_y_ordinal() const { return scroll_y_ordinal_; }
-  float scroll_velocity_x_ordinal() const { return scroll_velocity_x_ordinal_; }
-  float scroll_velocity_y_ordinal() const { return scroll_velocity_y_ordinal_; }
-  float velocity_x_ordinal() const { return velocity_x_ordinal_; }
-  float velocity_y_ordinal() const { return velocity_y_ordinal_; }
   float scroll_x_hint() const { return scroll_x_hint_; }
   float scroll_y_hint() const { return scroll_y_hint_; }
   float scale() const { return scale_; }
@@ -242,8 +224,6 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
         scroll_update_ = true;
         scroll_x_ += gesture->details().scroll_x();
         scroll_y_ += gesture->details().scroll_y();
-        scroll_x_ordinal_ += gesture->details().scroll_x_ordinal();
-        scroll_y_ordinal_ += gesture->details().scroll_y_ordinal();
         break;
       case ui::ET_GESTURE_SCROLL_END:
         EXPECT_TRUE(velocity_x_ == 0 && velocity_y_ == 0);
@@ -272,8 +252,6 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
         fling_ = true;
         velocity_x_ = gesture->details().velocity_x();
         velocity_y_ = gesture->details().velocity_y();
-        velocity_x_ordinal_ = gesture->details().velocity_x_ordinal();
-        velocity_y_ordinal_ = gesture->details().velocity_y_ordinal();
         break;
       case ui::ET_GESTURE_TWO_FINGER_TAP:
         two_finger_tap_ = true;
@@ -332,12 +310,6 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
   float scroll_velocity_y_;
   float velocity_x_;
   float velocity_y_;
-  float scroll_x_ordinal_;
-  float scroll_y_ordinal_;
-  float scroll_velocity_x_ordinal_;
-  float scroll_velocity_y_ordinal_;
-  float velocity_x_ordinal_;
-  float velocity_y_ordinal_;
   float scroll_x_hint_;
   float scroll_y_hint_;
   float scale_;
@@ -1225,9 +1197,7 @@ TEST_F(GestureRecognizerTest, GestureEventHorizontalRailFling) {
   // horizontal scroll.
   tes.SendScrollEvent(event_processor(), 25, 1, kTouchId, delegate.get());
   EXPECT_EQ(0, delegate->scroll_y());
-  EXPECT_EQ(1, delegate->scroll_y_ordinal());
   EXPECT_EQ(20, delegate->scroll_x());
-  EXPECT_EQ(20, delegate->scroll_x_ordinal());
 
   // Get a high x velocity, while still staying on the rail
   tes.SendScrollEvents(event_processor(), 1, 1,
@@ -1271,9 +1241,7 @@ TEST_F(GestureRecognizerTest, GestureEventVerticalRailFling) {
   // vertical scroll.
   tes.SendScrollEvent(event_processor(), 1, 25, kTouchId, delegate.get());
   EXPECT_EQ(20, delegate->scroll_y());
-  EXPECT_EQ(20, delegate->scroll_y_ordinal());
   EXPECT_EQ(0, delegate->scroll_x());
-  EXPECT_EQ(1, delegate->scroll_x_ordinal());
   EXPECT_EQ(0, delegate->scroll_velocity_x());
 
   // Get a high y velocity, while still staying on the rail

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));
 }

ui/events/gesture_event_details.h

@@ -17,9 +17,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
  public:
   GestureEventDetails();
   GestureEventDetails(EventType type, float delta_x, float delta_y);
-  GestureEventDetails(EventType type,
-                      float delta_x, float delta_y,
-                      float delta_x_ordinal, float delta_y_ordinal);
 
   EventType type() const { return type_; }
 
@@ -67,27 +64,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
     return data.fling_velocity.y;
   }
 
-  // *_ordinal values are unmodified by rail based clamping.
-  float scroll_x_ordinal() const {
-    DCHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_);
-    return data.scroll_update.x_ordinal;
-  }
-
-  float scroll_y_ordinal() const {
-    DCHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_);
-    return data.scroll_update.y_ordinal;
-  }
-
-  float velocity_x_ordinal() const {
-    DCHECK(type_ == ui::ET_SCROLL_FLING_START);
-    return data.fling_velocity.x_ordinal;
-  }
-
-  float velocity_y_ordinal() const {
-    DCHECK(type_ == ui::ET_SCROLL_FLING_START);
-    return data.fling_velocity.y_ordinal;
-  }
-
   float first_finger_width() const {
     DCHECK_EQ(ui::ET_GESTURE_TWO_FINGER_TAP, type_);
     return data.first_finger_enclosing_rectangle.width;
@@ -144,8 +120,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
     struct {  // SCROLL delta.
       float x;
       float y;
-      float x_ordinal;
-      float y_ordinal;
     } scroll_update;
 
     float scale;  // PINCH scale.
@@ -153,8 +127,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
     struct {  // FLING velocity.
       float x;
       float y;
-      float x_ordinal;
-      float y_ordinal;
     } fling_velocity;
 
     // Dimensions of the first finger's enclosing rectangle for

ui/events/gestures/gesture_sequence.cc

@@ -989,9 +989,7 @@ void GestureSequence::AppendScrollGestureEnd(const GesturePoint& point,
     gestures->push_back(CreateGestureEvent(
         GestureEventDetails(ui::ET_SCROLL_FLING_START,
             CalibrateFlingVelocity(railed_x_velocity),
-            CalibrateFlingVelocity(railed_y_velocity),
-            CalibrateFlingVelocity(x_velocity),
-            CalibrateFlingVelocity(y_velocity)),
+            CalibrateFlingVelocity(railed_y_velocity)),
         location,
         flags_,
         base::Time::FromDoubleT(point.last_touch_time()),
@@ -1044,8 +1042,6 @@ void GestureSequence::AppendScrollGestureUpdate(GesturePoint& point,
     d.set_y(d.y() * ratio);
   }
 
-  gfx::Vector2dF o = d;
-
   if (scroll_type_ == ST_HORIZONTAL)
     d.set_y(0);
   else if (scroll_type_ == ST_VERTICAL)
@@ -1053,8 +1049,7 @@ void GestureSequence::AppendScrollGestureUpdate(GesturePoint& point,
   if (d.IsZero())
     return;
 
-  GestureEventDetails details(ui::ET_GESTURE_SCROLL_UPDATE,
-                              d.x(), d.y(), o.x(), o.y());
+  GestureEventDetails details(ui::ET_GESTURE_SCROLL_UPDATE, d.x(), d.y());
   gestures->push_back(CreateGestureEvent(
       details,
       location,