Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: bump chromium to 93.0.4577.51 (14-x-y) (#30520)
* chore: bump chromium in DEPS to 93.0.4577.42 * ci: update git on CI machines (cherry picked from commit 9b2e028) * chore: update patches * test fix for (unrelated) bug showing up on linux-asan (cherry picked from commit a65d2da) * Disable kDesktopCaptureMacV2 https: //chromium-review.googlesource.com/c/chromium/src/+/3069272 (cherry picked from commit 4b308cb) Co-Authored-By: Robo <hop2deep@gmail.com> * chore: fix lint (cherry picked from commit ed0d9ad) * fixup Disable kDesktopCaptureMacV2 * chore: bump chromium in DEPS to 93.0.4577.51 * chore: update patches * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 (cherry picked from commit 205e477) * ci: run main and remote woa tests separately (cherry picked from commit 1de8f74) * fixup! Disable kDesktopCaptureMacV2 (cherry picked from commit bc6b974) Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Robo <hop2deep@gmail.com>
- Loading branch information
1 parent
e52c9e3
commit a279250
Showing
21 changed files
with
137 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
add_thread_local_to_x_error_trap_cc.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jeremy Rose <nornagon@nornagon.net> | ||
Date: Tue, 27 Jul 2021 10:32:54 -0700 | ||
Subject: add thread_local to x_error_trap.cc | ||
|
||
Per https://bugs.chromium.org/p/chromium/issues/detail?id=781618#c6. | ||
|
||
To fix this DCHECK firing: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/modules/desktop_capture/linux/x_error_trap.cc;l=35;drc=25ab3228f3e473f2226f219531ec617d2daa175e | ||
|
||
diff --git a/modules/desktop_capture/linux/x_error_trap.cc b/modules/desktop_capture/linux/x_error_trap.cc | ||
index 13233d827470d9d42be0333c3080e3d107f86fd5..62efb5b5b5194fc8961a27fe2a1efcd77e385d08 100644 | ||
--- a/modules/desktop_capture/linux/x_error_trap.cc | ||
+++ b/modules/desktop_capture/linux/x_error_trap.cc | ||
@@ -19,8 +19,8 @@ namespace webrtc { | ||
namespace { | ||
|
||
// TODO(sergeyu): This code is not thread safe. Fix it. Bug 2202. | ||
-static bool g_xserver_error_trap_enabled = false; | ||
-static int g_last_xserver_error_code = 0; | ||
+static thread_local bool g_xserver_error_trap_enabled = false; | ||
+static thread_local int g_last_xserver_error_code = 0; | ||
|
||
int XServerErrorHandler(Display* display, XErrorEvent* error_event) { | ||
RTC_DCHECK(g_xserver_error_trap_enabled); |
Oops, something went wrong.