Remove ui::GetDeviceScaleFactor(ui::Layer*)

The callers can just do layer->device_scale_factor() themselves.

R=sky@chromium.org

Bug: 1130050
Change-Id: Iccfd2ae47b4988e3f83868f10f99b61b4be3e0a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419507
Auto-Submit: danakj <danakj@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809427}

ash/host/transformer_helper.cc

@@ -11,6 +11,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/dip_util.h"
+#include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ -99,8 +100,8 @@ void TransformerHelper::SetRootWindowTransformer(
 }
 
 gfx::Transform TransformerHelper::GetTransform() const {
-  float scale = ui::GetDeviceScaleFactor(
-      ash_host_->AsWindowTreeHost()->window()->layer());
+  float scale =
+      ash_host_->AsWindowTreeHost()->window()->layer()->device_scale_factor();
   gfx::Transform transform;
   transform.Scale(scale, scale);
   transform *= transformer_->GetTransform();
@@ -108,8 +109,8 @@ gfx::Transform TransformerHelper::GetTransform() const {
 }
 
 gfx::Transform TransformerHelper::GetInverseTransform() const {
-  float scale = ui::GetDeviceScaleFactor(
-      ash_host_->AsWindowTreeHost()->window()->layer());
+  float scale =
+      ash_host_->AsWindowTreeHost()->window()->layer()->device_scale_factor();
   gfx::Transform transform;
   transform.Scale(1.0f / scale, 1.0f / scale);
   return transformer_->GetInverseTransform() * transform;

remoting/host/chromeos/point_transformer.cc

@@ -6,7 +6,7 @@
 
 #include "ash/shell.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/compositor/dip_util.h"
+#include "ui/compositor/layer.h"
 
 namespace remoting {
 
@@ -28,7 +28,7 @@ void PointTransformer::OnWindowTargetTransformChanging(
   CHECK_EQ(window, root_window_);
 
   ui::Layer* layer = root_window_->layer();
-  float scale = ui::GetDeviceScaleFactor(layer);
+  float scale = layer->device_scale_factor();
 
   gfx::Transform to_device_pixels;
   gfx::Transform to_dip;

ui/compositor/dip_util.cc

@@ -23,43 +23,39 @@
 
 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::ConvertPointToDIP(GetDeviceScaleFactor(layer), point_in_pixel);
+  return gfx::ConvertPointToDIP(layer->device_scale_factor(), point_in_pixel);
 }
 
 gfx::PointF ConvertPointToDIP(const Layer* layer,
                               const gfx::PointF& point_in_pixel) {
-  return gfx::ConvertPointToDIP(GetDeviceScaleFactor(layer), point_in_pixel);
+  return gfx::ConvertPointToDIP(layer->device_scale_factor(), point_in_pixel);
 }
 
 gfx::Size ConvertSizeToDIP(const Layer* layer,
                            const gfx::Size& size_in_pixel) {
-  return gfx::ConvertSizeToDIP(GetDeviceScaleFactor(layer), size_in_pixel);
+  return gfx::ConvertSizeToDIP(layer->device_scale_factor(), size_in_pixel);
 }
 
 gfx::Rect ConvertRectToDIP(const Layer* layer,
                            const gfx::Rect& rect_in_pixel) {
-  return gfx::ConvertRectToDIP(GetDeviceScaleFactor(layer), rect_in_pixel);
+  return gfx::ConvertRectToDIP(layer->device_scale_factor(), rect_in_pixel);
 }
 
 gfx::Point ConvertPointToPixel(const Layer* layer,
                                const gfx::Point& point_in_dip) {
-  return gfx::ConvertPointToPixel(GetDeviceScaleFactor(layer), point_in_dip);
+  return gfx::ConvertPointToPixel(layer->device_scale_factor(), point_in_dip);
 }
 
 gfx::Size ConvertSizeToPixel(const Layer* layer,
                              const gfx::Size& size_in_dip) {
-  return gfx::ConvertSizeToPixel(GetDeviceScaleFactor(layer), size_in_dip);
+  return gfx::ConvertSizeToPixel(layer->device_scale_factor(), size_in_dip);
 }
 
 gfx::Rect ConvertRectToPixel(const Layer* layer,
                              const gfx::Rect& rect_in_dip) {
-  return gfx::ConvertRectToPixel(GetDeviceScaleFactor(layer), rect_in_dip);
+  return gfx::ConvertRectToPixel(layer->device_scale_factor(), rect_in_dip);
 }
 
 }  // namespace ui

ui/compositor/dip_util.h

@@ -17,8 +17,6 @@ class Rect;
 namespace ui {
 class Layer;
 
-COMPOSITOR_EXPORT float GetDeviceScaleFactor(const Layer* layer);
-
 // Utility functions that convert point/size/rect between
 // DIP and pixel coordinates system.
 COMPOSITOR_EXPORT gfx::Point ConvertPointToDIP(