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

content/browser/devtools/protocol/input_handler.cc

 // Copyright 2014 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/devtools/protocol/input_handler.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input/synthetic_tap_gesture_params.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace content {
 namespace devtools {
 namespace input {
 
 namespace {
 
-gfx::Point CssPixelsToPoint(int x, int y, float page_scale_factor) {
-  return gfx::Point(x * page_scale_factor, y * page_scale_factor);
+gfx::PointF CssPixelsToPointF(int x, int y, float page_scale_factor) {
+  return gfx::PointF(x * page_scale_factor, y * page_scale_factor);
 }
 
-gfx::Vector2d CssPixelsToVector2d(int x, int y, float page_scale_factor) {
-  return gfx::Vector2d(x * page_scale_factor, y * page_scale_factor);
+gfx::Vector2dF CssPixelsToVector2dF(int x, int y, float page_scale_factor) {
+  return gfx::Vector2dF(x * page_scale_factor, y * page_scale_factor);
 }
 
 bool StringToGestureSourceType(const std::string& in,
                                SyntheticGestureParams::GestureSourceType& out) {
   if (in == kGestureSourceTypeDefault) {
     out = SyntheticGestureParams::GestureSourceType::DEFAULT_INPUT;
     return true;
   } else if (in == kGestureSourceTypeTouch) {
     out = SyntheticGestureParams::GestureSourceType::TOUCH_INPUT;
     return true;
@@ skipping 270 matching lines @@
     double scale_factor,
     const int* relative_speed,
     const std::string* gesture_source_type) {
   if (!host_)
     return Response::ServerError("Could not connect to view");
 
   SyntheticPinchGestureParams gesture_params;
   const int kDefaultRelativeSpeed = 800;
 
   gesture_params.scale_factor = scale_factor;
-  gesture_params.anchor = CssPixelsToPoint(x, y, page_scale_factor_);
+  gesture_params.anchor = CssPixelsToPointF(x, y, page_scale_factor_);
   gesture_params.relative_pointer_speed_in_pixels_s =
       relative_speed ? *relative_speed : kDefaultRelativeSpeed;
 
   if (!StringToGestureSourceType(
       gesture_source_type ? *gesture_source_type : kGestureSourceTypeDefault,
       gesture_params.gesture_source_type)) {
     return Response::InvalidParams("gestureSourceType");
   }
 
   host_->QueueSyntheticGesture(
@@ skipping 18 matching lines @@
     const int* repeat_count,
     const int* repeat_delay_ms,
     const std::string* interaction_marker_name) {
   if (!host_)
     return Response::ServerError("Could not connect to view");
 
   SyntheticSmoothScrollGestureParams gesture_params;
   const bool kDefaultPreventFling = true;
   const int kDefaultSpeed = 800;
 
-  gesture_params.anchor = CssPixelsToPoint(x, y, page_scale_factor_);
+  gesture_params.anchor = CssPixelsToPointF(x, y, page_scale_factor_);
   gesture_params.prevent_fling =
       prevent_fling ? *prevent_fling : kDefaultPreventFling;
   gesture_params.speed_in_pixels_s = speed ? *speed : kDefaultSpeed;
 
   if (x_distance || y_distance) {
     gesture_params.distances.push_back(
-        CssPixelsToVector2d(x_distance ? *x_distance : 0,
-                            y_distance ? *y_distance : 0,
-                            page_scale_factor_));
+        CssPixelsToVector2dF(x_distance ? *x_distance : 0,
+                             y_distance ? *y_distance : 0, page_scale_factor_));
   }
 
   if (x_overscroll || y_overscroll) {
-    gesture_params.distances.push_back(
-        CssPixelsToVector2d(x_overscroll ? -*x_overscroll : 0,
-                            y_overscroll ? -*y_overscroll : 0,
-                            page_scale_factor_));
+    gesture_params.distances.push_back(CssPixelsToVector2dF(
+        x_overscroll ? -*x_overscroll : 0, y_overscroll ? -*y_overscroll : 0,
+        page_scale_factor_));
   }
 
   if (!StringToGestureSourceType(
       gesture_source_type ? *gesture_source_type : kGestureSourceTypeDefault,
       gesture_params.gesture_source_type)) {
     return Response::InvalidParams("gestureSourceType");
   }
 
   SynthesizeRepeatingScroll(
       gesture_params, repeat_count ? *repeat_count : 0,
@@ skipping 54 matching lines @@
     const int* duration,
     const int* tap_count,
     const std::string* gesture_source_type) {
   if (!host_)
     return Response::ServerError("Could not connect to view");
 
   SyntheticTapGestureParams gesture_params;
   const int kDefaultDuration = 50;
   const int kDefaultTapCount = 1;
 
-  gesture_params.position = CssPixelsToPoint(x, y, page_scale_factor_);
+  gesture_params.position = CssPixelsToPointF(x, y, page_scale_factor_);
   gesture_params.duration_ms = duration ? *duration : kDefaultDuration;
 
   if (!StringToGestureSourceType(
       gesture_source_type ? *gesture_source_type : kGestureSourceTypeDefault,
       gesture_params.gesture_source_type)) {
     return Response::InvalidParams("gestureSourceType");
   }
 
   if (!tap_count)
     tap_count = &kDefaultTapCount;
@@ skipping 49 matching lines @@
   } else {
     client_->SendError(command_id,
                        Response::InternalError(base::StringPrintf(
                            "Synthetic tap failed, result was %d", result)));
   }
 }
 
 }  // namespace input
 }  // namespace devtools
 }  // namespace content