[Ozone] Fix ScreenPositionControllerTest.ConvertHostPointToScreen*

ash/display/screen_position_controller.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 "ash/display/screen_position_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 54 matching lines @@
 // function usually returns |window->GetRootWindow()|, but if the mouse pointer
 // is moved outside the |window|'s root while the mouse is captured, it returns
 // the other root window.
 std::pair<aura::Window*, gfx::Point> GetRootWindowRelativeToWindow(
     aura::Window* window,
     const gfx::Point& location) {
   aura::Window* root_window = window->GetRootWindow();
   gfx::Point location_in_root(location);
   aura::Window::ConvertPointToTarget(window, root_window, &location_in_root);
 
-#if defined(USE_X11)
+#if defined(USE_X11) || defined(USE_OZONE)
   if (!root_window->ContainsPointInRoot(location_in_root)) {
     // This conversion is necessary to deal with X's passive input
     // grab while dragging window. For example, if we have two
     // displays, say 1000x1000 (primary) and 500x500 (extended one
     // on the right), and start dragging a window at (999, 123), and
     // then move the pointer to the right, the pointer suddenly
     // warps to the extended display. The destination is (0, 123) in
     // the secondary root window's coordinates, or (1000, 123) in
     // the screen coordinates. However, since the mouse is captured
     // by X during drag, a weird LocatedEvent, something like (0, 1123)
     // in the *primary* root window's coordinates, is sent to Chrome
     // (Remember that in the native X11 world, the two root windows
     // are always stacked vertically regardless of the display
     // layout in Ash). We need to figure out that (0, 1123) in the
     // primary root window's coordinates is actually (0, 123) in the
     // extended root window's coordinates.
+    //
+    // For now Ozone works in a similar manner as X11. Transitioning from one
+    // display's coordinate system to anothers may cause events in the
+    // primary's coordinate system which fall in the extended display.
 
     gfx::Point location_in_native(location_in_root);
     root_window->GetHost()->ConvertPointToNativeScreen(&location_in_native);
 
     aura::Window::Windows root_windows = Shell::GetAllRootWindows();
     for (size_t i = 0; i < root_windows.size(); ++i) {
       aura::WindowTreeHost* host = root_windows[i]->GetHost();
       const gfx::Rect native_bounds = host->GetBounds();
       if (native_bounds.Contains(location_in_native)) {
         root_window = root_windows[i];
         location_in_root = location_in_native;
         host->ConvertPointFromNativeScreen(&location_in_root);
         break;
       }
     }
   }
 #else
   // TODO(yusukes): Support non-X11 platforms if necessary.
+  NOTIMPLEMENTED();
 #endif
 
   return std::make_pair(root_window, location_in_root);
 }
 
 }  // namespace
 
 void ScreenPositionController::ConvertPointToScreen(
     const aura::Window* window,
     gfx::Point* point) {
@@ skipping 99 matching lines @@
     }
   }
   gfx::Point origin(bounds.origin());
   const gfx::Point display_origin = Shell::GetScreen()->GetDisplayNearestWindow(
       window).bounds().origin();
   origin.Offset(-display_origin.x(), -display_origin.y());
   window->SetBounds(gfx::Rect(origin, bounds.size()));
 }
 
 }  // namespace ash