[patch] chromium-97.0.4692.71-fix-attch-dragging-tab.patch

chromium-97.0.4692.71-fix-attch-dragging-tab.patch (text/plain), 2.63 KB, created by Marco Genasci on 2022-01-12 12:44:26 UTC

From cf43c4f76a17692c5dcfb2da8774ae115ff7fa94 Mon Sep 17 00:00:00 2001
From: Marco Genasci <[e-mail]>
Date: Wed, 12 Jan 2022 07:35:20 +0100
Subject: [PATCH] [X11] Fix attach/dragging tab

Ref: https://bugs.chromium.org/p/chromium/issues/detail?id=1279532
Caused by: https://bugs.chromium.org/p/chromium/issues/detail?id=1263023
Patchesi from:
https://chromium-review.googlesource.com/c/chromium/src/+/3355376
https://chromium-review.googlesource.com/c/chromium/src/+/3355470
https://chromium-review.googlesource.com/c/chromium/src/+/3381679

---
 .../x11/x11_topmost_window_finder.cc          | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc
index 50e75e17f..c9c672c60 100644
--- a/ui/platform_window/x11/x11_topmost_window_finder.cc
+++ b/ui/platform_window/x11/x11_topmost_window_finder.cc
@@ -42,19 +42,12 @@ bool EnumerateChildren(ShouldStopIteratingCallback should_stop_iterating,
   // reverse-iterate the list to check the windows from top-to-bottom.
   std::vector<x11::Window>::reverse_iterator iter;
   for (iter = windows.rbegin(); iter != windows.rend(); iter++) {
-    if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter))
-      return true;
-  }
-
-  // If we're at this point, we didn't find the window we're looking for at the
-  // current level, so we need to recurse to the next level.  We use a second
-  // loop because the recursion and call to XQueryTree are expensive and is only
-  // needed for a small number of cases.
-  if (++depth <= max_depth) {
-    for (iter = windows.rbegin(); iter != windows.rend(); iter++) {
-      if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth))
+    if (depth < max_depth) {
+      if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth + 1))
         return true;
     }
+    if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter))
+      return true;
   }
 
   return false;
@@ -68,9 +61,9 @@ bool EnumerateAllWindows(ShouldStopIteratingCallback should_stop_iterating,
 
 void EnumerateTopLevelWindows(
     ui::ShouldStopIteratingCallback should_stop_iterating) {
-  // Some WMs parent 'top-level' windows in unnamed actual top-level windows
-  // (ion WM), so extend the search depth to all children of top-level windows.
-  const int kMaxSearchDepth = 1;
+  // WMs may reparent toplevel windows inside their own containers, so extend
+  // the search to all grandchildren of all toplevel windows.
+  const int kMaxSearchDepth = 2;
   ui::EnumerateAllWindows(should_stop_iterating, kMaxSearchDepth);
 }
 
-- 
2.34.1