Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / events / test / event_generator.cc

diff --git a/src/ui/events/test/event_generator.cc b/src/ui/events/test/event_generator.cc
index ad9d597..24b4387 100644 (file)
--- a/src/ui/events/test/event_generator.cc
+++ b/src/ui/events/test/event_generator.cc
@@ -14,7 +14,7 @@
 #include "ui/events/event_source.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/events_test_utils.h"
-#include "ui/gfx/vector2d_conversions.h"
+#include "ui/gfx/geometry/vector2d_conversions.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
@@ -301,9 +301,9 @@ void EventGenerator::GestureScrollSequenceWithCallback(
 
   callback.Run(ui::ET_GESTURE_SCROLL_BEGIN, gfx::Vector2dF());
 
-  int dx = (end.x() - start.x()) / steps;
-  int dy = (end.y() - start.y()) / steps;
-  gfx::Point location = start;
+  float dx = static_cast<float>(end.x() - start.x()) / steps;
+  float dy = static_cast<float>(end.y() - start.y()) / steps;
+  gfx::PointF location = start;
   for (int i = 0; i < steps; ++i) {
     location.Offset(dx, dy);
     timestamp += step_delay;
@@ -436,7 +436,7 @@ void EventGenerator::ScrollSequence(const gfx::Point& start,
 
 void EventGenerator::ScrollSequence(const gfx::Point& start,
                                     const base::TimeDelta& step_delay,
-                                    const std::vector<gfx::Point>& offsets,
+                                    const std::vector<gfx::PointF>& offsets,
                                     int num_fingers) {
   size_t steps = offsets.size();
   base::TimeDelta timestamp = Now();