ash: ozone: apply transformation to events outside the root window

ash/host/ash_window_tree_host_ozone.cc

 // Copyright 2014 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 "ash/host/ash_window_tree_host.h"
 
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/host/transformer_helper.h"
 #include "base/command_line.h"
+#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_tree_host_ozone.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/transform.h"
 
 namespace ash {
 namespace {
 
 class AshWindowTreeHostOzone : public AshWindowTreeHost,
                                public aura::WindowTreeHostOzone {
  public:
   explicit AshWindowTreeHostOzone(const gfx::Rect& initial_bounds);
   virtual ~AshWindowTreeHostOzone();
 
  private:
+  void TranslateMouseEvent(ui::LocatedEvent* event);
+
   // AshWindowTreeHost:
   virtual void ToggleFullScreen() override;
   virtual bool ConfineCursorToRootWindow() override;
   virtual void UnConfineCursor() override;
   virtual void SetRootWindowTransformer(
       scoped_ptr<RootWindowTransformer> transformer) override;
   virtual gfx::Insets GetHostInsets() const override;
   virtual aura::WindowTreeHost* AsWindowTreeHost() override;
   virtual void SetRootTransform(const gfx::Transform& transform) override;
   virtual gfx::Transform GetRootTransform() const override;
   virtual gfx::Transform GetInverseRootTransform() const override;
   virtual void UpdateRootWindowSize(const gfx::Size& host_size) override;
+  virtual void DispatchEvent(ui::Event* event) override;
 
   TransformerHelper transformer_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostOzone);
 };
 
 AshWindowTreeHostOzone::AshWindowTreeHostOzone(const gfx::Rect& initial_bounds)
     : aura::WindowTreeHostOzone(initial_bounds),
       transformer_helper_(this) {}
 
 AshWindowTreeHostOzone::~AshWindowTreeHostOzone() {}
 
+void AshWindowTreeHostOzone::TranslateMouseEvent(ui::LocatedEvent* event) {
+  aura::Window* root_window = window();
+  aura::client::ScreenPositionClient* screen_position_client =
+      aura::client::GetScreenPositionClient(root_window);
+  gfx::Rect local(GetBounds().size());
+
+  local.Inset(transformer_helper_.GetHostInsets());
+
+  if (screen_position_client && !local.Contains(event->location())) {
+    gfx::Point location(event->location());
+    // In order to get the correct point in screen coordinates during
+    // passive grab, we first need to find on which host window the
+    // mouse is on, and find out the screen coordinates on that host
+    // window, then convert it back to this host window's coordinate.
+    screen_position_client->ConvertHostPointToScreen(root_window, &location);
+    screen_position_client->ConvertPointFromScreen(root_window, &location);
+    ConvertPointToHost(&location);
+    event->set_location(location);
+    event->set_root_location(location);
+  }

[sadrul, 2014/11/24 22:27:04]

You should refactor this so you are not duplicating code from
AshWindowTreeHostX11.

+}
+
 void AshWindowTreeHostOzone::ToggleFullScreen() {
   NOTIMPLEMENTED();
 }
 
 bool AshWindowTreeHostOzone::ConfineCursorToRootWindow() {
   return false;
 }
 
 void AshWindowTreeHostOzone::UnConfineCursor() {
   NOTIMPLEMENTED();
@@ skipping 21 matching lines @@
 }
 
 gfx::Transform AshWindowTreeHostOzone::GetInverseRootTransform() const {
   return transformer_helper_.GetInverseTransform();
 }
 
 void AshWindowTreeHostOzone::UpdateRootWindowSize(const gfx::Size& host_size) {
   transformer_helper_.UpdateWindowSize(host_size);
 }
 
+void AshWindowTreeHostOzone::DispatchEvent(ui::Event* event) {
+  if (event->IsMouseEvent() || event->IsScrollEvent())
+    TranslateMouseEvent(static_cast<ui::LocatedEvent*>(event));

[sadrul, 2014/11/24 22:27:04]

We do this translation for touch-events too on x11. Do we not need it here?

+  SendEventToProcessor(event);
+}
+
 }  // namespace
 
 AshWindowTreeHost* AshWindowTreeHost::Create(
     const AshWindowTreeHostInitParams& init_params) {
   return new AshWindowTreeHostOzone(init_params.initial_bounds);
 }
 
 }  // namespace ash