Add support for ordinal scroll amounts

ui/aura/test/event_generator.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/aura/test/event_generator.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 294 matching lines @@
                                     float x_offset,
                                     float y_offset,
                                     int steps,
                                     int num_fingers) {
   base::TimeDelta timestamp = base::TimeDelta::FromInternalValue(
       base::TimeTicks::Now().ToInternalValue());
   ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL,
                                start,
                                timestamp,
                                0,
-                               0,
-                               0,
+                               0, 0,
+                               0, 0,
                                num_fingers);
   Dispatch(&fling_cancel);
 
   float dx = x_offset / steps;
   float dy = y_offset / steps;
   for (int i = 0; i < steps; ++i) {
     timestamp += step_delay;
     ui::ScrollEvent move(ui::ET_SCROLL,
                          start,
                          timestamp,
                          0,
-                         dx,
-                         dy,
+                         dx, dy,
+                         dx, dy,
                          num_fingers);
     Dispatch(&move);
   }
 
   ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START,
                               start,
                               timestamp,
                               0,
-                              x_offset,
-                              y_offset,
+                              x_offset, y_offset,
+                              x_offset, y_offset,
                               num_fingers);
   Dispatch(&fling_start);
 }
 
 void EventGenerator::ScrollSequence(const gfx::Point& start,
                                     const base::TimeDelta& step_delay,
                                     const std::vector<gfx::Point>& offsets,
                                     int num_fingers) {
   int steps = offsets.size();
   base::TimeDelta timestamp = ui::EventTimeForNow();
   ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL,
                                start,
                                timestamp,
                                0,
-                               0,
-                               0,
+                               0, 0,
+                               0, 0,
                                num_fingers);
   Dispatch(&fling_cancel);
 
   for (int i = 0; i < steps; ++i) {
     timestamp += step_delay;
     ui::ScrollEvent scroll(ui::ET_SCROLL,
                            start,
                            timestamp,
                            0,
-                           offsets[i].x(),
-                           offsets[i].y(),
+                           offsets[i].x(), offsets[i].y(),
+                           offsets[i].x(), offsets[i].y(),
                            num_fingers);
     Dispatch(&scroll);
   }
 
   ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START,
                               start,
                               timestamp,
                               0,
-                              offsets[steps - 1].x(),
-                              offsets[steps - 1].y(),
+                              offsets[steps - 1].x(), offsets[steps - 1].y(),
+                              offsets[steps - 1].x(), offsets[steps - 1].y(),
                               num_fingers);
   Dispatch(&fling_start);
 }
 
 void EventGenerator::PressKey(ui::KeyboardCode key_code, int flags) {
   DispatchKeyEvent(true, key_code, flags);
 }
 
 void EventGenerator::ReleaseKey(ui::KeyboardCode key_code, int flags) {
   DispatchKeyEvent(false, key_code, flags);
@@ skipping 147 matching lines @@
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(&EventGenerator::DispatchNextPendingEvent,
                    base::Unretained(this)));
   }
 }
 
 
 }  // namespace test
 }  // namespace aura