Merge 199249 "Magnifier: Prevent the cursor jumping on HiDPI dis..."

ui/aura/root_window.cc

Index: ui/aura/root_window.cc
===================================================================
--- ui/aura/root_window.cc	(revision 199610)
+++ ui/aura/root_window.cc	(working copy)
@@ -528,6 +528,14 @@
     OnHostResized(host_->GetBounds().size());
 }
 
+gfx::Transform RootWindow::GetRootTransform() const {
+  float scale = ui::GetDeviceScaleFactor(layer());
+  gfx::Transform transform;
+  transform.Scale(scale, scale);
+  transform *= transformer_->GetTransform();
+  return transform;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, ui::EventTarget implementation:
 
@@ -1159,14 +1167,6 @@
   OnHostMouseEvent(&event);
 }
 
-gfx::Transform RootWindow::GetRootTransform() const {
-  float scale = ui::GetDeviceScaleFactor(layer());
-  gfx::Transform transform;
-  transform.Scale(scale, scale);
-  transform *= transformer_->GetTransform();
-  return transform;
-}
-
 gfx::Transform RootWindow::GetInverseRootTransform() const {
   float scale = ui::GetDeviceScaleFactor(layer());
   gfx::Transform transform;