Refactor Windows DPI Point, Rect, and Size for Multiple Monitor DPI Awareness

ui/gfx/win/dpi.h

Index: ui/gfx/win/dpi.h
diff --git a/ui/gfx/win/dpi.h b/ui/gfx/win/dpi.h
index 17f69b3c431bd4db8590ea4a53b980bd59058f7c..91dab4883ab178b1123f8acd69d4e82ee5286837 100644
--- a/ui/gfx/win/dpi.h
+++ b/ui/gfx/win/dpi.h
@@ -9,6 +9,7 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gfx_export.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 
@@ -19,7 +20,7 @@ namespace gfx {
 // have no effect.
 GFX_EXPORT void InitDeviceScaleFactor(float scale);
 
-GFX_EXPORT Size GetDPI();
+GFX_EXPORT int GetDPIFromScalingFactor(float device_scaling_factor);
 
 // Gets the scale factor of the display. For example, if the display DPI is
 // 96 then the scale factor is 1.0.
@@ -27,20 +28,6 @@ GFX_EXPORT float GetDPIScale();
 
 namespace win {
 
-GFX_EXPORT Point ScreenToDIPPoint(const Point& pixel_point);
-
-GFX_EXPORT Point DIPToScreenPoint(const Point& dip_point);
-
-// WARNING: there is no right way to scale sizes and rects. The implementation
-// of these strives to maintain a constant size by scaling the size independent
-// of the origin. An alternative is to get the enclosing rect, which is the
-// right way for some situations. Understand which you need before blindly
-// assuming this is the right way.
-GFX_EXPORT Rect ScreenToDIPRect(const Rect& pixel_bounds);
-GFX_EXPORT Rect DIPToScreenRect(const Rect& dip_bounds);
-GFX_EXPORT Size ScreenToDIPSize(const Size& size_in_pixels);
-GFX_EXPORT Size DIPToScreenSize(const Size& dip_size);
-
 // Win32's GetSystemMetrics uses pixel measures. This function calls
 // GetSystemMetrics for the given |metric|, then converts the result to DIP.
 GFX_EXPORT int GetSystemMetricsInDIP(int metric);