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

Unified Diff: ui/views/widget/root_view_unittest.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-gfx: . Created 5 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
Index: ui/views/widget/root_view_unittest.cc
diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc
index ea739ae9229269e7f39920d64948cd54c4d75f96..acadaf9125d6be159d879547d1c11b9117fd3f4f 100644
--- a/ui/views/widget/root_view_unittest.cc
+++ b/ui/views/widget/root_view_unittest.cc
@@ -391,8 +391,8 @@ TEST_F(RootViewTest, DeleteViewOnMouseExitDispatch) {
// Generate a mouse move event which ensures that the mouse_moved_handler_
// member is set in the RootView class.
- ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
- gfx::Point(15, 15), ui::EventTimeForNow(), 0,
+ ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::PointF(15.f, 15.f),
+ gfx::PointF(15.f, 15.f), ui::EventTimeForNow(), 0,
0);
root_view->OnMouseMoved(moved_event);
ASSERT_FALSE(view_destroyed);
@@ -400,7 +400,7 @@ TEST_F(RootViewTest, DeleteViewOnMouseExitDispatch) {
// Generate a mouse exit event which in turn will delete the child view which
// was the target of the mouse move event above. This should not crash when
// the mouse exit handler returns from the child.
- ui::MouseEvent exit_event(ui::ET_MOUSE_EXITED, gfx::Point(), gfx::Point(),
+ ui::MouseEvent exit_event(ui::ET_MOUSE_EXITED, gfx::PointF(), gfx::PointF(),
ui::EventTimeForNow(), 0, 0);
root_view->OnMouseExited(exit_event);
@@ -431,8 +431,8 @@ TEST_F(RootViewTest, DeleteViewOnMouseEnterDispatch) {
static_cast<internal::RootView*>(widget.GetRootView());
// Move the mouse within |widget| but outside of |child|.
- ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
- gfx::Point(15, 15), ui::EventTimeForNow(), 0,
+ ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::PointF(15.f, 15.f),
+ gfx::PointF(15.f, 15.f), ui::EventTimeForNow(), 0,
0);
root_view->OnMouseMoved(moved_event);
ASSERT_FALSE(view_destroyed);
@@ -440,9 +440,9 @@ TEST_F(RootViewTest, DeleteViewOnMouseEnterDispatch) {
// Move the mouse within |child|, which should dispatch a mouse enter event to
// |child| and destroy the view. This should not crash when the mouse enter
// handler returns from the child.
- ui::MouseEvent moved_event2(ui::ET_MOUSE_MOVED, gfx::Point(115, 115),
- gfx::Point(115, 115), ui::EventTimeForNow(), 0,
- 0);
+ ui::MouseEvent moved_event2(ui::ET_MOUSE_MOVED, gfx::PointF(115.f, 115.f),
+ gfx::PointF(115.f, 115.f), ui::EventTimeForNow(),
+ 0, 0);
root_view->OnMouseMoved(moved_event2);
EXPECT_TRUE(view_destroyed);
@@ -495,8 +495,8 @@ TEST_F(RootViewTest, DeleteWidgetOnMouseExitDispatch) {
static_cast<internal::RootView*>(widget->GetRootView());
// Move the mouse within |child|.
- ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(115, 115),
- gfx::Point(115, 115), ui::EventTimeForNow(), 0,
+ ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::PointF(115.f, 115.f),
+ gfx::PointF(115.f, 115), ui::EventTimeForNow(), 0,
0);
root_view->OnMouseMoved(moved_event);
ASSERT_TRUE(widget_deletion_observer.IsWidgetAlive());
@@ -504,8 +504,9 @@ TEST_F(RootViewTest, DeleteWidgetOnMouseExitDispatch) {
// Move the mouse outside of |child| which should dispatch a mouse exit event
// to |child| and destroy the widget. This should not crash when the mouse
// exit handler returns from the child.
- ui::MouseEvent move_event2(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
- gfx::Point(15, 15), ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent move_event2(ui::ET_MOUSE_MOVED, gfx::PointF(15.f, 15.f),
+ gfx::PointF(15.f, 15.f), ui::EventTimeForNow(), 0,
+ 0);
root_view->OnMouseMoved(move_event2);
EXPECT_FALSE(widget_deletion_observer.IsWidgetAlive());
}
@@ -540,16 +541,18 @@ TEST_F(RootViewTest, DeleteWidgetOnMouseExitDispatchFromChild) {
static_cast<internal::RootView*>(widget->GetRootView());
// Move the mouse within |subchild| and |child|.
- ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(115, 115),
- gfx::Point(115, 115), ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::PointF(115.f, 115.f),
+ gfx::PointF(115.f, 115.f), ui::EventTimeForNow(),
+ 0, 0);
root_view->OnMouseMoved(moved_event);
ASSERT_TRUE(widget_deletion_observer.IsWidgetAlive());
// Move the mouse outside of |subchild| and |child| which should dispatch a
// mouse exit event to |subchild| and destroy the widget. This should not
// crash when the mouse exit handler returns from |subchild|.
- ui::MouseEvent move_event2(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
- gfx::Point(15, 15), ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent move_event2(ui::ET_MOUSE_MOVED, gfx::PointF(15.f, 15.f),
+ gfx::PointF(15.f, 15.f), ui::EventTimeForNow(), 0,
+ 0);
root_view->OnMouseMoved(move_event2);
EXPECT_FALSE(widget_deletion_observer.IsWidgetAlive());
}

Powered by Google App Engine
This is Rietveld 408576698