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

ui/aura/root_window.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/aura/root_window.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 510 matching lines @@
     scoped_ptr<RootWindowTransformer> transformer) {
   transformer_ = transformer.Pass();
   host_->SetInsets(transformer_->GetHostInsets());
   Window::SetTransform(transformer_->GetTransform());
   // If the layer is not animating, then we need to update the host size
   // immediately.
   if (!layer()->GetAnimator()->is_animating())
     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:
 
 ui::EventTarget* RootWindow::GetParentTarget() {
   return client::GetEventClient(this) ?
       client::GetEventClient(this)->GetToplevelEventTarget() :
           Env::GetInstance();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 611 matching lines @@
 
   // TODO(derat|oshima): Don't use mouse_button_flags_ as it's
   // currently broken. See/ crbug.com/107931.
   ui::MouseEvent event(ui::ET_MOUSE_MOVED,
                        host_mouse_location,
                        host_mouse_location,
                        ui::EF_IS_SYNTHESIZED);
   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;
   transform.Scale(1.0f / scale, 1.0f / scale);
   return transformer_->GetInverseTransform() * transform;
 }
 
 }  // namespace aura