Remove Event::system_location

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 22 matching lines @@
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
 
+#if defined(OS_CHROMEOS)
+#include "ui/base/events/event_utils.h"
+#endif
+
 using std::vector;
 
 namespace aura {
 
 namespace {
 
 const char kRootWindowForAcceleratedWidget[] =
     "__AURA_ROOT_WINDOW_ACCELERATED_WIDGET__";
 
 // Returns true if |target| has a non-client (frame) component at |location|,
@@ skipping 634 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, private:
 
 void RootWindow::TransformEventForDeviceScaleFactor(bool keep_inside_root,
                                                     ui::LocatedEvent* event) {
   event->UpdateForRootTransform(GetInverseRootTransform());
 #if defined(OS_CHROMEOS)
   const gfx::Rect& root_bounds = bounds();
+  if (!event->native_event())
+    return;
+  const gfx::Point system_location =
+      ui::EventSystemLocationFromNative(event->native_event());
   if (keep_inside_root &
-      host_->GetBounds().Contains(event->system_location()) &&
+      host_->GetBounds().Contains(system_location) &&
       !root_bounds.Contains(event->root_location())) {
     // Make sure that the mouse location inside the host window gets
     // translated inside root window.
     // TODO(oshima): This is (hopefully) short term bandaid to deal
     // with calculation error due to the fact that we rotate in dip
     // coordinates instead of pixels. crbug.com/222483.
+    // When removing this, don't forget to remove the include of the
+    // event_util.h file.
     int x = event->location().x();
     int y = event->location().y();
     x = std::min(std::max(x, root_bounds.x()), root_bounds.right());
     y = std::min(std::max(y, root_bounds.y()), root_bounds.bottom());
     const gfx::Point new_location(x, y);
     event->set_location(new_location);
     event->set_root_location(new_location);
   }
 #endif  // defined(OS_CHROMEOS)
 }
@@ skipping 446 matching lines @@
     return;
   gfx::Point host_mouse_location = root_mouse_location;
   ConvertPointToHost(&host_mouse_location);
 
   // 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);
   ConvertPointToNativeScreen(&root_mouse_location);

[sadrul, 2013/04/10 00:12:41]

Is this conversion necessary anymore?

[oshima, 2013/04/10 01:28:01]

doh, you're right. removed.

-  event.set_system_location(root_mouse_location);
   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