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

ash/host/ash_window_tree_host_x11.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_x11.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 
 #include <string>
 #include <vector>
 
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
 #include "base/basictypes.h"
 #include "base/sys_info.h"
-#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_source.h"
@@ skipping 189 matching lines @@
       }
 #endif  // defined(OS_CHROMEOS)
       return true;
     }
     default:
       return true;
   }
 }
 void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent(
     ui::LocatedEvent* event) {
-  if (!event->IsTouchEvent()) {
-    aura::Window* root_window = window();
-    aura::client::ScreenPositionClient* screen_position_client =
-        aura::client::GetScreenPositionClient(root_window);
-    gfx::Rect local(bounds().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);
-    }
-  }
+  TranslateLocatedEvent(event);
   SendEventToProcessor(event);
 }
 
 #if defined(OS_CHROMEOS)
 void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) {
   if (!ui::IsXInput2Available())
     return;
   // Temporarily pause tap-to-click when the cursor is hidden.
   Atom prop = atom_cache()->GetAtom("Tap Paused");
   unsigned char value = state;
@@ skipping 34 matching lines @@
   }
 }
 #endif
 
 AshWindowTreeHost* AshWindowTreeHost::Create(
     const AshWindowTreeHostInitParams& init_params) {
   return new AshWindowTreeHostX11(init_params.initial_bounds);
 }
 
 }  // namespace ash