Move dip utils to gfx/geometry

ui/compositor/dip_util.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 "ui/compositor/dip_util.h"
 
 #include "base/command_line.h"
 #include "cc/layers/layer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/display.h"
-#include "ui/gfx/geometry/safe_integer_conversions.h"
+#include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/size_conversions.h"
 
 #if DCHECK_IS_ON
 #include "ui/compositor/layer_animator.h"
 #endif
 
 namespace ui {
 
 float GetDeviceScaleFactor(const Layer* layer) {
   return layer->device_scale_factor();
 }
 
 gfx::Point ConvertPointToDIP(const Layer* layer,
                              const gfx::Point& point_in_pixel) {
-  return gfx::ToFlooredPoint(
-      gfx::ScalePoint(point_in_pixel, 1.0f / GetDeviceScaleFactor(layer)));
+  return gfx::ConvertPointToDIP(GetDeviceScaleFactor(layer), point_in_pixel);
 }
 
 gfx::PointF ConvertPointToDIP(const Layer* layer,
                               const gfx::PointF& point_in_pixel) {
-  return gfx::ScalePoint(point_in_pixel, 1.0f / GetDeviceScaleFactor(layer));
+  return gfx::ConvertPointToDIP(GetDeviceScaleFactor(layer), point_in_pixel);
 }
 
 gfx::Size ConvertSizeToDIP(const Layer* layer,
                            const gfx::Size& size_in_pixel) {
-  return gfx::ToFlooredSize(
-      gfx::ScaleSize(size_in_pixel, 1.0f / GetDeviceScaleFactor(layer)));
+  return gfx::ConvertSizeToDIP(GetDeviceScaleFactor(layer), size_in_pixel);
 }
 
 gfx::Rect ConvertRectToDIP(const Layer* layer,
                            const gfx::Rect& rect_in_pixel) {
-  float scale = 1.0f / GetDeviceScaleFactor(layer);
-  return gfx::ToFlooredRectDeprecated(gfx::ScaleRect(rect_in_pixel, scale));
+  return gfx::ConvertRectToDIP(GetDeviceScaleFactor(layer), rect_in_pixel);
 }
 
 gfx::Point ConvertPointToPixel(const Layer* layer,
                                const gfx::Point& point_in_dip) {
-  return gfx::ToFlooredPoint(
-      gfx::ScalePoint(point_in_dip, GetDeviceScaleFactor(layer)));
+  return gfx::ConvertPointToPixel(GetDeviceScaleFactor(layer), point_in_dip);
 }
 
 gfx::Size ConvertSizeToPixel(const Layer* layer,
                              const gfx::Size& size_in_dip) {
-  return gfx::ToFlooredSize(
-      gfx::ScaleSize(size_in_dip, GetDeviceScaleFactor(layer)));
+  return gfx::ConvertSizeToPixel(GetDeviceScaleFactor(layer), size_in_dip);
 }
 
 gfx::Rect ConvertRectToPixel(const Layer* layer,
                              const gfx::Rect& rect_in_dip) {
-  float scale = GetDeviceScaleFactor(layer);
-  // Use ToEnclosingRect() to ensure we paint all the possible pixels
-  // touched. ToEnclosingRect() floors the origin, and ceils the max
-  // coordinate. To do otherwise (such as flooring the size) potentially
-  // results in rounding down and not drawing all the pixels that are
-  // touched.
-  return gfx::ToEnclosingRect(
-      gfx::RectF(gfx::ScalePoint(rect_in_dip.origin(), scale),
-                 gfx::ScaleSize(rect_in_dip.size(), scale)));
+  return gfx::ConvertRectToPixel(GetDeviceScaleFactor(layer), rect_in_dip);
 }
 
 #if DCHECK_IS_ON
 namespace {
 
 void CheckSnapped(float snapped_position) {
   const float kEplison = 0.0001f;
   float diff = std::abs(snapped_position - gfx::ToRoundedInt(snapped_position));
   DCHECK_LT(diff, kEplison);
 }
@@ skipping 31 matching lines @@
   } else {
     cc::Layer* cc_layer = layer_to_snap->cc_layer();
     origin = cc_layer->position();
   }
   CheckSnapped((layer_offset.x() + origin.x()) * scale_factor);
   CheckSnapped((layer_offset.y() + origin.y()) * scale_factor);
 #endif
 }
 
 }  // namespace ui