Add support for maintaining ordinal values through GestureRecognizer

ui/aura/gestures/gesture_recognizer_unittest.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 "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 72 matching lines @@
         swipe_left_(false),
         swipe_right_(false),
         swipe_up_(false),
         swipe_down_(false),
         scroll_x_(0),
         scroll_y_(0),
         scroll_velocity_x_(0),
         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),
         tap_count_(0),
         wait_until_event_(ui::ET_UNKNOWN) {
   }
 
   virtual ~GestureEventConsumeDelegate() {}
 
   void Reset() {
     events_.clear();
     tap_ = false;
     tap_down_ = false;
@@ skipping 16 matching lines @@
 
     scroll_begin_position_.SetPoint(0, 0);
     tap_location_.SetPoint(0, 0);
 
     scroll_x_ = 0;
     scroll_y_ = 0;
     scroll_velocity_x_ = 0;
     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;
     tap_count_ = 0;
   }
 
   const std::vector<ui::EventType>& events() const { return events_; };
 
   bool tap() const { return tap_; }
   bool tap_down() const { return tap_down_; }
   bool tap_cancel() const { return tap_cancel_; }
   bool begin() const { return begin_; }
   bool end() const { return end_; }
@@ skipping 17 matching lines @@
   }
 
   const gfx::Point tap_location() const {
     return tap_location_;
   }
 
   float scroll_x() const { return scroll_x_; }
   float scroll_y() const { return scroll_y_; }
   float scroll_velocity_x() const { return scroll_velocity_x_; }
   float scroll_velocity_y() const { return scroll_velocity_y_; }
-  int touch_id() const { return touch_id_; }
   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_; }
+  int touch_id() const { return touch_id_; }
   const gfx::Rect& bounding_box() const { return bounding_box_; }
   int tap_count() const { return tap_count_; }
 
   void WaitUntilReceivedGesture(ui::EventType type) {
     wait_until_event_ = type;
     run_loop_.reset(new base::RunLoop(
         Env::GetInstance()->GetDispatcher()));
     run_loop_->Run();
   }
 
@@ skipping 21 matching lines @@
       case ui::ET_GESTURE_SCROLL_BEGIN:
         scroll_begin_ = true;
         scroll_begin_position_ = gesture->location();
         break;
       case ui::ET_GESTURE_SCROLL_UPDATE:
         scroll_update_ = true;
         scroll_x_ += gesture->details().scroll_x();
         scroll_y_ += gesture->details().scroll_y();
         scroll_velocity_x_ = gesture->details().velocity_x();
         scroll_velocity_y_ = gesture->details().velocity_y();
+        scroll_x_ordinal_ += gesture->details().scroll_x_ordinal();
+        scroll_y_ordinal_ += gesture->details().scroll_y_ordinal();
+        scroll_velocity_x_ordinal_ = gesture->details().velocity_x_ordinal();
+        scroll_velocity_y_ordinal_ = gesture->details().velocity_y_ordinal();
         break;
       case ui::ET_GESTURE_SCROLL_END:
         EXPECT_TRUE(velocity_x_ == 0 && velocity_y_ == 0);
         scroll_end_ = true;
         break;
       case ui::ET_GESTURE_PINCH_BEGIN:
         pinch_begin_ = true;
         break;
       case ui::ET_GESTURE_PINCH_UPDATE:
         pinch_update_ = true;
         break;
       case ui::ET_GESTURE_PINCH_END:
         pinch_end_ = true;
         break;
       case ui::ET_GESTURE_LONG_PRESS:
         long_press_ = true;
         touch_id_ = gesture->details().touch_id();
         break;
       case ui::ET_GESTURE_LONG_TAP:
         long_tap_ = true;
         break;
       case ui::ET_SCROLL_FLING_START:
         EXPECT_TRUE(gesture->details().velocity_x() != 0 ||
                     gesture->details().velocity_y() != 0);
         EXPECT_FALSE(scroll_end_);
         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;
         break;
       case ui::ET_GESTURE_MULTIFINGER_SWIPE:
         swipe_left_ = gesture->details().swipe_left();
         swipe_right_ = gesture->details().swipe_right();
         swipe_up_ = gesture->details().swipe_up();
         swipe_down_ = gesture->details().swipe_down();
         break;
@@ skipping 33 matching lines @@
 
   gfx::Point scroll_begin_position_;
   gfx::Point tap_location_;
 
   float scroll_x_;
   float scroll_y_;
   float scroll_velocity_x_;
   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_;
   int touch_id_;
   gfx::Rect bounding_box_;
   int tap_count_;
 
   ui::EventType wait_until_event_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureEventConsumeDelegate);
 };
 
 class QueueTouchEventDelegate : public GestureEventConsumeDelegate {
@@ skipping 795 matching lines @@
       delegate.get(), -1234, bounds, root_window()));
 
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),
                        kTouchId, tes.Now());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
 
   // Move the touch-point horizontally enough that it is considered a
   // horizontal scroll.
   tes.SendScrollEvent(root_window(), 20, 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(root_window(), 1, 1,
                    100, 10, kTouchId, 1,
                    ui::GestureConfiguration::points_buffered_for_velocity(),
                    delegate.get());
   // The y-velocity during the scroll should be 0 since this is in a horizontal
   // rail scroll.
   EXPECT_GT(delegate->scroll_velocity_x(), 0);
   EXPECT_EQ(0, delegate->scroll_velocity_y());
@@ skipping 21 matching lines @@
       delegate.get(), -1234, bounds, root_window()));
 
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),
                        kTouchId, tes.Now());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
 
   // Move the touch-point vertically enough that it is considered a
   // vertical scroll.
   tes.SendScrollEvent(root_window(), 1, 20, 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());
+  EXPECT_GT(delegate->scroll_velocity_x_ordinal(), 0);
 
   // Get a high y velocity, while still staying on the rail
   tes.SendScrollEvents(root_window(), 1, 1,
                        10, 100, kTouchId, 1,
                        ui::GestureConfiguration::points_buffered_for_velocity(),
                        delegate.get());
   EXPECT_EQ(0, delegate->scroll_velocity_x());
   EXPECT_GT(delegate->scroll_velocity_y(), 0);
 
   delegate->Reset();
@@ skipping 2218 matching lines @@
                        tes.LeapForward(40));
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move4);
   EXPECT_TRUE(delegate->scroll_update());
   EXPECT_EQ(-1, delegate->scroll_y());
 
   delegate->Reset();
 }
 
 }  // namespace test
 }  // namespace aura