Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: ui/views/view_targeter_unittest.cc

Issue 577833003: Revert of Clean up GestureEventDetails constructors and fix unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/touchui/touch_selection_controller_impl_unittest.cc ('k') | ui/views/widget/root_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view_targeter_unittest.cc
diff --git a/ui/views/view_targeter_unittest.cc b/ui/views/view_targeter_unittest.cc
index b855161d542de582ef14636f21840def1ac67006..92d0fd6fecaae65858ec0d2de9c1939a18ff30bc 100644
--- a/ui/views/view_targeter_unittest.cc
+++ b/ui/views/view_targeter_unittest.cc
@@ -231,7 +231,7 @@
y,
0,
base::TimeDelta(),
- ui::GestureEventDetails(type)) {}
+ ui::GestureEventDetails(type, 0.0f, 0.0f)) {}
GestureEventForTest(ui::GestureEventDetails details, int x, int y)
: GestureEvent(x, y, 0, base::TimeDelta(), details) {}
@@ -266,13 +266,13 @@
// Define some gesture events for testing.
gfx::Rect bounding_box(gfx::Point(46, 46), gfx::Size(8, 8));
gfx::Point center_point(bounding_box.CenterPoint());
- ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
+ ui::GestureEventDetails details(ui::ET_GESTURE_TAP, 0.0f, 0.0f);
details.set_bounding_box(bounding_box);
GestureEventForTest tap(details, center_point.x(), center_point.y());
- details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN);
+ details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN, 0.0f, 0.0f);
details.set_bounding_box(bounding_box);
GestureEventForTest scroll_begin(details, center_point.x(), center_point.y());
- details = ui::GestureEventDetails(ui::ET_GESTURE_END);
+ details = ui::GestureEventDetails(ui::ET_GESTURE_END, 0.0f, 0.0f);
details.set_bounding_box(bounding_box);
GestureEventForTest end(details, center_point.x(), center_point.y());
@@ -324,14 +324,14 @@
// again (calls to FindTargetForEvent() and FindNextBestTarget()
// mutate the location of the gesture events to be in the coordinate
// space of the returned view).
- details = ui::GestureEventDetails(ui::ET_GESTURE_TAP);
+ details = ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0.0f, 0.0f);
details.set_bounding_box(bounding_box);
tap = GestureEventForTest(details, center_point.x(), center_point.y());
- details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN);
+ details = ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN, 0.0f, 0.0f);
details.set_bounding_box(bounding_box);
scroll_begin =
GestureEventForTest(details, center_point.x(), center_point.y());
- details = ui::GestureEventDetails(ui::ET_GESTURE_END);
+ details = ui::GestureEventDetails(ui::ET_GESTURE_END, 0.0f, 0.0f);
details.set_bounding_box(bounding_box);
end = GestureEventForTest(details, center_point.x(), center_point.y());
@@ -381,7 +381,7 @@
// in root view coordinates with width and height of 4.
gfx::Rect bounding_box(gfx::Point(58, 58), gfx::Size(4, 4));
gfx::Point center_point(bounding_box.CenterPoint());
- ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
+ ui::GestureEventDetails details(ui::ET_GESTURE_TAP, 0.0f, 0.0f);
details.set_bounding_box(bounding_box);
GestureEventForTest tap(details, center_point.x(), center_point.y());
« no previous file with comments | « ui/views/touchui/touch_selection_controller_impl_unittest.cc ('k') | ui/views/widget/root_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698