Add support for maintaining ordinal values through GestureRecognizer

ui/base/gestures/gesture_types.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/gestures/gesture_types.h"
 
 namespace ui {
 
 GestureEventDetails::GestureEventDetails(ui::EventType type,
                                          float delta_x,
                                          float delta_y)
     : type_(type),
       touch_points_(1) {
   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;
+      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.scroll_update.x_ordinal = delta_x;

[rjkroege, 2013/08/09 22:18:43]

should be fling_velocity?

[DaveMoore, 2013/08/12 20:38:16]

Done.

+      data.scroll_update.y_ordinal = delta_y;
       break;
 
     case ui::ET_GESTURE_LONG_PRESS:
       data.touch_id = static_cast<int>(delta_x);
       CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for long press.";
       break;
 
     case ui::ET_GESTURE_TWO_FINGER_TAP:
       data.first_finger_enclosing_rectangle.width = delta_x;
       data.first_finger_enclosing_rectangle.height = delta_y;
@@ skipping 18 matching lines @@
 
     default:
       if (delta_x != 0.f || delta_y != 0.f) {
         DLOG(WARNING) << "A gesture event (" << type << ") had unknown data: ("
                       << delta_x << "," << delta_y;
       }
       break;
   }
 }
 
+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.scroll_update.x_ordinal = delta_x_ordinal;

[rjkroege, 2013/08/09 22:18:43]

should be fling_velocity here and line below?

[DaveMoore, 2013/08/12 20:38:16]

Done.

+      data.scroll_update.y_ordinal = delta_y_ordinal;
+      break;
+
+    default:
+      break;
+  }
+}
+
 void GestureEventDetails::SetScrollVelocity(float velocity_x,
-                                            float velocity_y) {
+                                            float velocity_y,
+                                            float velocity_x_ordinal,
+                                            float velocity_y_ordinal) {
   CHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_);
   data.scroll_update.velocity_x = velocity_x;
   data.scroll_update.velocity_y = velocity_y;
+  data.scroll_update.velocity_x_ordinal = velocity_x_ordinal;
+  data.scroll_update.velocity_y_ordinal = velocity_y_ordinal;
 }
 
 }  // namespace ui