Merge pull request #3 from import/chromium-browser-stable:rosa2016.1

Backports and update
This commit is contained in:
djam 2022-01-21 20:52:41 +00:00
commit 4f10a4742a
3 changed files with 3 additions and 40 deletions

View file

@ -1,5 +1,5 @@
sources:
chromium-97.0.4692.71.tar.xz: 9c1e5e82165555c7247684218a50c586f5a40c06
chromium-97.0.4692.99.tar.xz: c9f525e5eb01b30e68c1c330d7c4975d208fe4fb
chromium-gost-63253fcf20fea4093044da8713f2b695e0f31b64.tar.gz: e4f542423ef8846df4d5b4dc26721cfe54166dc4
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3

View file

@ -1,35 +0,0 @@
From 52d0ad25ea695da44195e49f36e69fa81b55e670 Mon Sep 17 00:00:00 2001
From: Tom Anderson <thomasanderson@chromium.org>
Date: Wed, 5 Jan 2022 21:11:03 +0000
Subject: [PATCH] [X11] Fix tag dragging in KWin
R=sky
Bug: 1279532
Change-Id: Iac166803e2149eef234045d922b630f0019c8073
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3355376
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/main@{#955869}
---
ui/platform_window/x11/x11_topmost_window_finder.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc
index 50e75e17f0aa9..2e16393487bc9 100644
--- a/ui/platform_window/x11/x11_topmost_window_finder.cc
+++ b/ui/platform_window/x11/x11_topmost_window_finder.cc
@@ -68,9 +68,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);
}

View file

@ -85,8 +85,8 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 97.0.4692.71
Release: 2
Version: 97.0.4692.99
Release: 1
License: BSD, LGPL
Group: Networking/WWW
Url: https://www.chromium.org/Home
@ -127,8 +127,6 @@ Patch647: ALT-allow-to-override-clang-through-env-variables.patch
# XXX This patch is not enough to fully fix debuginfo and debugsource subpackages
Patch648: fix-debugsource.patch
Patch649: off-java-check.patch
# https://bugs.chromium.org/p/chromium/issues/detail?id=1281287#c3
Patch650: 52d0ad25ea695da44195e49f36e69fa81b55e670.patch
BuildRequires: bison
BuildRequires: llvm12