gfx: Make conversions from gfx::Point to PointF explicit.

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1456 matching lines @@
 // Tests that wheel events generated from scroll events are targetted to the
 // views under the cursor when the focused view does not processed them.
 TEST_F(WidgetTest, WheelEventsFromScrollEventTarget) {
   EventCountView* cursor_view = new EventCountView;
   cursor_view->SetBounds(60, 0, 50, 40);
 
   Widget* widget = CreateTopLevelPlatformWidget();
   widget->GetRootView()->AddChildView(cursor_view);
 
   // Generate a scroll event on the cursor view.
-  ui::ScrollEvent scroll(ui::ET_SCROLL,
-                         gfx::Point(65, 5),
-                         ui::EventTimeForNow(),
-                         0,
-                         0, 20,
-                         0, 20,
-                         2);
+  ui::ScrollEvent scroll(ui::ET_SCROLL, gfx::PointF(65.f, 5.f),
+                         ui::EventTimeForNow(), 0, 0, 20, 0, 20, 2);
   widget->OnScrollEvent(&scroll);
 
   EXPECT_EQ(1, cursor_view->GetEventCount(ui::ET_SCROLL));
   EXPECT_EQ(1, cursor_view->GetEventCount(ui::ET_MOUSEWHEEL));
 
   cursor_view->ResetCounts();
 
-  ui::ScrollEvent scroll2(ui::ET_SCROLL,
-                          gfx::Point(5, 5),
-                          ui::EventTimeForNow(),
-                          0,
-                          0, 20,
-                          0, 20,
-                          2);
+  ui::ScrollEvent scroll2(ui::ET_SCROLL, gfx::PointF(5.f, 5.f),
+                          ui::EventTimeForNow(), 0, 0, 20, 0, 20, 2);
   widget->OnScrollEvent(&scroll2);
 
   EXPECT_EQ(0, cursor_view->GetEventCount(ui::ET_SCROLL));
   EXPECT_EQ(0, cursor_view->GetEventCount(ui::ET_MOUSEWHEEL));
 
   widget->CloseNow();
 }
 
 // Tests that if a scroll-begin gesture is not handled, then subsequent scroll
 // events are not dispatched to any view.
@@ skipping 80 matching lines @@
   root_view->AddPreTargetHandler(&h1);
 
   EventCountHandler h2;
   root_view->AddPostTargetHandler(&h2);
 
   widget->SetBounds(gfx::Rect(0, 0, 100, 100));
   widget->Show();
 
   // Dispatch a ui::ET_SCROLL event. The event remains unhandled and should
   // bubble up the views hierarchy to be re-dispatched on the root view.
-  ui::ScrollEvent scroll(ui::ET_SCROLL,
-                         gfx::Point(5, 5),
-                         ui::EventTimeForNow(),
-                         0,
-                         0, 20,
-                         0, 20,
-                         2);
+  ui::ScrollEvent scroll(ui::ET_SCROLL, gfx::PointF(5.f, 5.f),
+                         ui::EventTimeForNow(), 0, 0, 20, 0, 20, 2);
   widget->OnScrollEvent(&scroll);
   EXPECT_EQ(2, h1.GetEventCount(ui::ET_SCROLL));
   EXPECT_EQ(1, view->GetEventCount(ui::ET_SCROLL));
   EXPECT_EQ(2, h2.GetEventCount(ui::ET_SCROLL));
 
   // Unhandled scroll events are turned into wheel events and re-dispatched.
   EXPECT_EQ(1, h1.GetEventCount(ui::ET_MOUSEWHEEL));
   EXPECT_EQ(1, view->GetEventCount(ui::ET_MOUSEWHEEL));
   EXPECT_EQ(1, h2.GetEventCount(ui::ET_MOUSEWHEEL));
 
   h1.ResetCounts();
   view->ResetCounts();
   h2.ResetCounts();
 
   // Dispatch a ui::ET_SCROLL_FLING_START event. The event remains unhandled and
   // should bubble up the views hierarchy to be re-dispatched on the root view.
-  ui::ScrollEvent fling(ui::ET_SCROLL_FLING_START,
-                        gfx::Point(5, 5),
-                        ui::EventTimeForNow(),
-                        0,
-                        0, 20,
-                        0, 20,
-                        2);
+  ui::ScrollEvent fling(ui::ET_SCROLL_FLING_START, gfx::PointF(5.f, 5.f),
+                        ui::EventTimeForNow(), 0, 0, 20, 0, 20, 2);
   widget->OnScrollEvent(&fling);
   EXPECT_EQ(2, h1.GetEventCount(ui::ET_SCROLL_FLING_START));
   EXPECT_EQ(1, view->GetEventCount(ui::ET_SCROLL_FLING_START));
   EXPECT_EQ(2, h2.GetEventCount(ui::ET_SCROLL_FLING_START));
 
   // Unhandled scroll events which are not of type ui::ET_SCROLL should not
   // be turned into wheel events and re-dispatched.
   EXPECT_EQ(0, h1.GetEventCount(ui::ET_MOUSEWHEEL));
   EXPECT_EQ(0, view->GetEventCount(ui::ET_MOUSEWHEEL));
   EXPECT_EQ(0, h2.GetEventCount(ui::ET_MOUSEWHEEL));
@@ skipping 29 matching lines @@
   EXPECT_EQ(1, h1.GetEventCount(ui::ET_GESTURE_TAP_CANCEL));
   EXPECT_EQ(1, view->GetEventCount(ui::ET_GESTURE_TAP_CANCEL));
   EXPECT_EQ(0, h2.GetEventCount(ui::ET_GESTURE_TAP_CANCEL));
 
   h1.ResetCounts();
   view->ResetCounts();
   h2.ResetCounts();
 
   // Dispatch a ui::ET_SCROLL event. The event is handled at the target phase
   // and should not reach the post-target handler.
-  ui::ScrollEvent consumed_scroll(ui::ET_SCROLL,
-                                  gfx::Point(5, 5),
-                                  ui::EventTimeForNow(),
-                                  0,
-                                  0, 20,
-                                  0, 20,
-                                  2);
+  ui::ScrollEvent consumed_scroll(ui::ET_SCROLL, gfx::PointF(5.f, 5.f),
+                                  ui::EventTimeForNow(), 0, 0, 20, 0, 20, 2);
   widget->OnScrollEvent(&consumed_scroll);
   EXPECT_EQ(1, h1.GetEventCount(ui::ET_SCROLL));
   EXPECT_EQ(1, view->GetEventCount(ui::ET_SCROLL));
   EXPECT_EQ(0, h2.GetEventCount(ui::ET_SCROLL));
 
   // Handled scroll events are not turned into wheel events and re-dispatched.
   EXPECT_EQ(0, h1.GetEventCount(ui::ET_MOUSEWHEEL));
   EXPECT_EQ(0, view->GetEventCount(ui::ET_MOUSEWHEEL));
   EXPECT_EQ(0, h2.GetEventCount(ui::ET_MOUSEWHEEL));
 
@@ skipping 14 matching lines @@
 
   widget->Show();
 
   // SynthesizeMouseMoveEvent does nothing until the mouse is entered.
   widget->SynthesizeMouseMoveEvent();
   EXPECT_EQ(0, v1->GetEventCount(ui::ET_MOUSE_MOVED));
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_MOUSE_MOVED));
 
   gfx::Point cursor_location(5, 5);
   View::ConvertPointToScreen(widget->GetRootView(), &cursor_location);
-  ui::MouseEvent move(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
-                      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::PointF(cursor_location),
+                      gfx::PointF(cursor_location), ui::EventTimeForNow(),
+                      ui::EF_NONE, ui::EF_NONE);
   ui::EventDispatchDetails details =
       WidgetTest::GetEventProcessor(widget)->OnEventFromSource(&move);
   EXPECT_FALSE(details.dispatcher_destroyed);
 
   EXPECT_EQ(1, v1->GetEventCount(ui::ET_MOUSE_MOVED));
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_MOUSE_MOVED));
 
   // SynthesizeMouseMoveEvent dispatches an mousemove event.
   widget->SynthesizeMouseMoveEvent();
   EXPECT_EQ(2, v1->GetEventCount(ui::ET_MOUSE_MOVED));
@@ skipping 421 matching lines @@
   widget->SetBounds(gfx::Rect(0, 0, 300, 300));
   View* view = new RootViewTestView();
   view->SetBounds(0, 0, 300, 300);
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget->GetRootView());
   root_view->AddChildView(view);
 
   // Check RootView::mouse_pressed_handler_.
   widget->Show();
   EXPECT_EQ(NULL, GetMousePressedHandler(root_view));
-  gfx::Point click_location(45, 15);
+  gfx::PointF click_location(45.f, 15.f);
   ui::MouseEvent press(ui::ET_MOUSE_PRESSED, click_location, click_location,
                        ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
                        ui::EF_LEFT_MOUSE_BUTTON);
   widget->OnMouseEvent(&press);
   EXPECT_EQ(view, GetMousePressedHandler(root_view));
   widget->Hide();
   EXPECT_EQ(NULL, GetMousePressedHandler(root_view));
 
   // Check RootView::mouse_move_handler_.
   widget->Show();
   EXPECT_EQ(NULL, GetMouseMoveHandler(root_view));
-  gfx::Point move_location(45, 15);
+  gfx::PointF move_location(45.f, 15.f);
   ui::MouseEvent move(ui::ET_MOUSE_MOVED, move_location, move_location,
                       ui::EventTimeForNow(), 0, 0);
   widget->OnMouseEvent(&move);
   EXPECT_EQ(view, GetMouseMoveHandler(root_view));
   widget->Hide();
   EXPECT_EQ(NULL, GetMouseMoveHandler(root_view));
 
   // Check RootView::gesture_handler_.
   widget->Show();
   EXPECT_EQ(NULL, GetGestureHandler(root_view));
-  ui::GestureEvent tap_down(15,
-                            15,
-                            0,
-                            base::TimeDelta(),
+  ui::GestureEvent tap_down(15.f, 15.f, 0, base::TimeDelta(),
                             ui::GestureEventDetails(ui::ET_GESTURE_TAP_DOWN));
   widget->OnGestureEvent(&tap_down);
   EXPECT_EQ(view, GetGestureHandler(root_view));
   widget->Hide();
   EXPECT_EQ(NULL, GetGestureHandler(root_view));
 
   widget->Close();
 }
 
 // Convenience to make constructing a GestureEvent simpler.
@@ skipping 1059 matching lines @@
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(true);
   EXPECT_TRUE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(false);
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views