Revert 252502 "Fixes DesktopScreenX11::GetWindowAtScreenPoint() ..."

trunk/src/ui/views/widget/desktop_aura/desktop_screen_x11.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/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
@@ skipping 45 matching lines @@
   if (!gfx::Display::HasForceDeviceScaleFactor() &&
       !ui::IsXDisplaySizeBlackListed(mm_width, mm_height)) {
     float device_scale_factor = GetDeviceScaleFactor(width, mm_width);
     DCHECK_LE(1.0f, device_scale_factor);
     gfx_display.SetScaleAndBounds(device_scale_factor, bounds_in_pixels);
   }
 
   return std::vector<gfx::Display>(1, gfx_display);
 }
 
-// Helper class to GetWindowAtScreenPoint() which returns the topmost window at
-// the location passed to FindAt(). NULL is returned if a window which does not
-// belong to Chromium is topmost at the passed in location.
-class ToplevelWindowFinder : public ui::EnumerateWindowsDelegate {
- public:
-  ToplevelWindowFinder() : toplevel_(NULL) {
-  }
-
-  virtual ~ToplevelWindowFinder() {
-  }
-
-  aura::Window* FindAt(const gfx::Point& screen_loc) {
-    screen_loc_ = screen_loc;
-    ui::EnumerateTopLevelWindows(this);
-    return toplevel_;
-  }
-
- protected:
-  virtual bool ShouldStopIterating(XID xid) OVERRIDE {
-    aura::Window* window =
-        views::DesktopWindowTreeHostX11::GetContentWindowForXID(xid);
-    if (window) {
-      if (window->IsVisible() &&
-          window->GetBoundsInScreen().Contains(screen_loc_)) {
-        toplevel_ = window;
-        return true;
-      }
-      return false;
-    }
-
-    if (ui::IsWindowVisible(xid) &&
-        ui::WindowContainsPoint(xid, screen_loc_)) {
-      // toplevel_ = NULL
-      return true;
-    }
-    return false;
-  }
-
-  gfx::Point screen_loc_;
-  aura::Window* toplevel_;
-
-  DISALLOW_COPY_AND_ASSIGN(ToplevelWindowFinder);
-};
-
 }  // namespace
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, public:
 
 DesktopScreenX11::DesktopScreenX11()
     : xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
@@ skipping 99 matching lines @@
 
   return gfx::Point(root_x, root_y);
 }
 
 gfx::NativeWindow DesktopScreenX11::GetWindowUnderCursor() {
   return GetWindowAtScreenPoint(GetCursorScreenPoint());
 }
 
 gfx::NativeWindow DesktopScreenX11::GetWindowAtScreenPoint(
     const gfx::Point& point) {
-  ToplevelWindowFinder finder;
-  return finder.FindAt(point);
+  std::vector<aura::Window*> windows =
+      DesktopWindowTreeHostX11::GetAllOpenWindows();
+
+  for (std::vector<aura::Window*>::const_iterator it = windows.begin();
+       it != windows.end(); ++it) {
+    if ((*it)->GetBoundsInScreen().Contains(point))
+      return *it;
+  }
+
+  return NULL;
 }
 
 int DesktopScreenX11::GetNumDisplays() const {
   return displays_.size();
 }
 
 std::vector<gfx::Display> DesktopScreenX11::GetAllDisplays() const {
   return displays_;
 }
 
@@ skipping 177 matching lines @@
   ProcessDisplayChange(new_displays);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views