Index: ui/gfx/win/dpi.h |
diff --git a/ui/gfx/win/dpi.h b/ui/gfx/win/dpi.h |
index b77e2dc0db70ff3875758bc0969a5abe4f40c501..3130a556952fd5235b62928e8bc2c9e20dbb2fdc 100644 |
--- a/ui/gfx/win/dpi.h |
+++ b/ui/gfx/win/dpi.h |
@@ -5,9 +5,6 @@ |
#ifndef UI_GFX_DPI_WIN_H_ |
#define UI_GFX_DPI_WIN_H_ |
-#include "ui/gfx/geometry/point.h" |
-#include "ui/gfx/geometry/rect.h" |
-#include "ui/gfx/geometry/size.h" |
#include "ui/gfx/gfx_export.h" |
namespace gfx { |
@@ -18,7 +15,7 @@ namespace gfx { |
// will be that returned by GetDPIScale(). |
GFX_EXPORT void SetDefaultDeviceScaleFactor(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. This clamps scale factors <= 1.25 to 1.0 to |
@@ -28,20 +25,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); |