Changes tab dragging code to continue iterating through windows if...

chrome/browser/dock_info.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/dock_info.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 141 matching lines @@
     return finder.is_top_most_;
   }
 
   virtual bool ShouldStopIterating(HWND hwnd) {
     if (hwnd == target_) {
       // Window is topmost, stop iterating.
       is_top_most_ = true;
       return true;
     }
 
-    if (::IsWindowVisible(hwnd)) {
-      CRect r;
-      if (::GetWindowRect(hwnd, &r) && r.PtInRect(screen_loc_.ToPOINT())) {
-        // Not the topmost, stop iterating.
-        return true;
-      }
+    if (!::IsWindowVisible(hwnd)) {
+      // The window isn't visible, keep iterating.
+      return false;
     }
-    return false;
+
+    CRect r;
+    if (!::GetWindowRect(hwnd, &r) || !r.PtInRect(screen_loc_.ToPOINT())) {
+      // The window doesn't contain the point, keep iterating.
+      return false;
+    }
+
+    // hwnd is at the point. Make sure the point is within the windows region.
+    if (GetWindowRgn(hwnd, tmp_region_.Get()) == ERROR) {
+      // There's no region on the window and the window contains the point. Stop
+      // iterating.
+      return true;
+    }
+
+    // The region is relative to the window's rect.
+    BOOL is_point_in_region = PtInRegion(tmp_region_.Get(),
+        screen_loc_.x() - r.left, screen_loc_.y() - r.top);
+    tmp_region_ = CreateRectRgn(0, 0, 0, 0);
+    // Stop iterating if the region contains the point.
+    return !!is_point_in_region;
   }
 
  private:
   TopMostFinder(HWND window,
                 const gfx::Point& screen_loc,
                 const std::set<HWND>& ignore)
       : BaseWindowFinder(ignore),
         target_(window),
         screen_loc_(screen_loc),
-        is_top_most_(false) {
+        is_top_most_(false),
+        tmp_region_(CreateRectRgn(0, 0, 0, 0)) {
     EnumWindows(WindowCallbackProc, reinterpret_cast<LPARAM>(this));
   }
 
   // The window we're looking for.
   HWND target_;
 
   // Location of window to find.
   gfx::Point screen_loc_;
 
   // Is target_ the top most window? This is initially false but set to true
   // in ShouldStopIterating if target_ is passed in.
   bool is_top_most_;
 
+  ScopedHRGN tmp_region_;
+
   DISALLOW_COPY_AND_ASSIGN(TopMostFinder);
 };
 
 // WindowFinder ---------------------------------------------------------------
 
 // Helper class to determine if a particular point contains a window from our
 // process.
 class LocalProcessWindowFinder : public BaseWindowFinder {
  public:
   // Returns the hwnd from our process at screen_loc that is not obscured by
@@ skipping 294 matching lines @@
                                  Type type) {
   if (IsCloseToMonitorPoint(screen_loc, x, y, type, &in_enable_area_) &&
       (type != MAXIMIZE ||
        !IsMaximizedTabbedBrowserOnMonitor(monitor))) {
     hot_spot_.SetPoint(x, y);
     type_ = type;
     return true;
   }
   return false;
 }