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

content/browser/web_contents/web_contents_view_aura_browsertest.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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 472 matching lines @@
   ExecuteSyncJSFunction(main_frame, "navigate_next()");
   EXPECT_EQ(2, GetCurrentIndex());
   web_contents->GetController().GoBack();
   EXPECT_EQ(1, GetCurrentIndex());
 
   aura::Window* content = web_contents->GetContentNativeView();
   ui::EventProcessor* dispatcher = content->GetHost()->event_processor();
   gfx::Rect bounds = content->GetBoundsInRootWindow();
 
   base::TimeDelta timestamp = ui::EventTimeForNow();
-  ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
-      gfx::Point(bounds.x() + bounds.width() / 2, bounds.y() + 5),
-      0, timestamp);
+  ui::TouchEvent press(
+      ui::ET_TOUCH_PRESSED,
+      gfx::PointF(bounds.x() + bounds.width() / 2.f, bounds.y() + 5.f), 0,
+      timestamp);
   ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(1, GetCurrentIndex());
 
   timestamp += base::TimeDelta::FromMilliseconds(10);
   ui::TouchEvent move1(ui::ET_TOUCH_MOVED,
-      gfx::Point(bounds.right() - 10, bounds.y() + 5),
-      0, timestamp);
+                       gfx::PointF(bounds.right() - 10.f, bounds.y() + 5.f), 0,
+                       timestamp);
   details = dispatcher->OnEventFromSource(&move1);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(1, GetCurrentIndex());
 
   // Swipe back from the right edge, back to the left edge, back to the right
   // edge.
 
   for (int x = bounds.right() - 10; x >= bounds.x() + 10; x-= 10) {
     timestamp += base::TimeDelta::FromMilliseconds(10);
-    ui::TouchEvent inc(ui::ET_TOUCH_MOVED,
-        gfx::Point(x, bounds.y() + 5),
-        0, timestamp);
+    ui::TouchEvent inc(ui::ET_TOUCH_MOVED, gfx::PointF(x, bounds.y() + 5.f), 0,
+                       timestamp);
     details = dispatcher->OnEventFromSource(&inc);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(1, GetCurrentIndex());
   }
 
   for (int x = bounds.x() + 10; x <= bounds.width() - 10; x+= 10) {
     timestamp += base::TimeDelta::FromMilliseconds(10);
-    ui::TouchEvent inc(ui::ET_TOUCH_MOVED,
-        gfx::Point(x, bounds.y() + 5),
-        0, timestamp);
+    ui::TouchEvent inc(ui::ET_TOUCH_MOVED, gfx::PointF(x, bounds.y() + 5.f), 0,
+                       timestamp);
     details = dispatcher->OnEventFromSource(&inc);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(1, GetCurrentIndex());
   }
 
   for (int x = bounds.width() - 10; x >= bounds.x() + 10; x-= 10) {
     timestamp += base::TimeDelta::FromMilliseconds(10);
-    ui::TouchEvent inc(ui::ET_TOUCH_MOVED,
-        gfx::Point(x, bounds.y() + 5),
-        0, timestamp);
+    ui::TouchEvent inc(ui::ET_TOUCH_MOVED, gfx::PointF(x, bounds.y() + 5.f), 0,
+                       timestamp);
     details = dispatcher->OnEventFromSource(&inc);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(1, GetCurrentIndex());
   }
 
   // Do not end the overscroll sequence.
 }
 
 // Tests that the page has has a screenshot when navigation happens:
 //  - from within the page (from a JS function)
@@ skipping 482 matching lines @@
 
   aura::Window* content = web_contents->GetContentNativeView();
   ui::EventProcessor* dispatcher = content->GetHost()->event_processor();
   gfx::Rect bounds = content->GetBoundsInRootWindow();
 
   // Overscroll horizontally.
   {
     int kXStep = bounds.width() / 10;
     gfx::Point location(bounds.right() - kXStep, bounds.y() + 5);
     base::TimeDelta timestamp = ui::EventTimeForNow();
-    ui::TouchEvent press(
-        ui::ET_TOUCH_PRESSED,
-        location,
-        0,
-        timestamp);
+    ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::PointF(location), 0,
+                         timestamp);
     ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
     location -= gfx::Vector2d(kXStep, 0);
     timestamp += base::TimeDelta::FromMilliseconds(10);
 
     while (location.x() > bounds.x() + kXStep) {
-      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, location, 0, timestamp);
+      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, gfx::PointF(location), 0,
+                         timestamp);
       details = dispatcher->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location -= gfx::Vector2d(10, 0);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
-    ui::TouchEvent release(ui::ET_TOUCH_RELEASED, location, 0, timestamp);
+    ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::PointF(location), 0,
+                           timestamp);
     details = dispatcher->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_EQ(0, tracker.num_overscroll_updates());
     EXPECT_FALSE(tracker.overscroll_completed());
   }
 
   // Overscroll vertically.
   {
     tracker.Reset();
 
     int kYStep = bounds.height() / 10;
     gfx::Point location(bounds.x() + 10, bounds.y() + kYStep);
     base::TimeDelta timestamp = ui::EventTimeForNow();
-    ui::TouchEvent press(
-        ui::ET_TOUCH_PRESSED,
-        location,
-        0,
-        timestamp);
+    ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::PointF(location), 0,
+                         timestamp);
     ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
     location += gfx::Vector2d(0, kYStep);
     timestamp += base::TimeDelta::FromMilliseconds(10);
 
     while (location.y() < bounds.bottom() - kYStep) {
-      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, location, 0, timestamp);
+      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, gfx::PointF(location), 0,
+                         timestamp);
       details = dispatcher->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location += gfx::Vector2d(0, kYStep);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
-    ui::TouchEvent release(ui::ET_TOUCH_RELEASED, location, 0, timestamp);
+    ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::PointF(location), 0,
+                           timestamp);
     details = dispatcher->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_LT(0, tracker.num_overscroll_updates());
     EXPECT_TRUE(tracker.overscroll_completed());
   }
 
   // Start out overscrolling vertically, then switch directions and finish
   // overscrolling horizontally.
   {
     tracker.Reset();
 
     int kXStep = bounds.width() / 10;
     int kYStep = bounds.height() / 10;
     gfx::Point location = bounds.origin() + gfx::Vector2d(0, kYStep);
     base::TimeDelta timestamp = ui::EventTimeForNow();
-    ui::TouchEvent press(
-        ui::ET_TOUCH_PRESSED,
-        location,
-        0,
-        timestamp);
+    ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::PointF(location), 0,
+                         timestamp);
     ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
     location += gfx::Vector2d(0, kYStep);
     timestamp += base::TimeDelta::FromMilliseconds(10);
 
     for (size_t i = 0; i < 3; ++i) {
-      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, location, 0, timestamp);
+      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, gfx::PointF(location), 0,
+                         timestamp);
       details = dispatcher->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location += gfx::Vector2d(0, kYStep);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
     while (location.x() < bounds.right() - kXStep) {
-      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, location, 0, timestamp);
+      ui::TouchEvent inc(ui::ET_TOUCH_MOVED, gfx::PointF(location), 0,
+                         timestamp);
       details = dispatcher->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location += gfx::Vector2d(kXStep, 0);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
-    ui::TouchEvent release(ui::ET_TOUCH_RELEASED, location, 0, timestamp);
+    ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::PointF(location), 0,
+                           timestamp);
     details = dispatcher->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_LT(0, tracker.num_overscroll_updates());
     EXPECT_FALSE(tracker.overscroll_completed());
   }
 }
 
 }  // namespace content