Nico Grunbaum
3b3a29acfa
Upstream commit: https://webrtc.googlesource.com/src/+/7e3a9ce99d832687d1eef3eaa270754970a761b0 Rely on TaskQueueBase interface in modules/rtp_rtcp Instead of requiring Thread to be passed to the RtpVideoStreamReceiverFrameTransformerDelegate. This class already uses it only though the TaskQueueBase interface. In tests rely on RunLoop helper when test makes calls that are required to be done on the same task queue, and rely on TaskQueueForTests where test does not make such calls. Bug: webrtc:42225410 Change-Id: I7aba5c696436d8ce43c85ccba5b9448e852ea81d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/470880 Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47662}
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 28 Sep 2023 14:12:00 +0000
|
|
Subject: Bug 1832465 - remove libXtst usage from libwebrtc.
|
|
r=ng,webrtc-reviewers
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D189386
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0ec1b33b95dbb2d39355f28b2812fe25b4ad9f20
|
|
---
|
|
modules/desktop_capture/BUILD.gn | 3 +++
|
|
modules/desktop_capture/linux/x11/shared_x_display.cc | 4 ++++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
|
|
index 1db919f987..f263c47ab3 100644
|
|
--- a/modules/desktop_capture/BUILD.gn
|
|
+++ b/modules/desktop_capture/BUILD.gn
|
|
@@ -405,6 +405,9 @@ rtc_library("desktop_capture") {
|
|
"Xrender",
|
|
"Xtst",
|
|
]
|
|
+ if (build_with_mozilla) {
|
|
+ libs -= [ "Xtst" ]
|
|
+ }
|
|
}
|
|
|
|
if (!is_win && !is_mac && !rtc_use_x11_extensions && !rtc_use_pipewire &&
|
|
diff --git a/modules/desktop_capture/linux/x11/shared_x_display.cc b/modules/desktop_capture/linux/x11/shared_x_display.cc
|
|
index 3cb2636f09..f7eca06820 100644
|
|
--- a/modules/desktop_capture/linux/x11/shared_x_display.cc
|
|
+++ b/modules/desktop_capture/linux/x11/shared_x_display.cc
|
|
@@ -11,7 +11,9 @@
|
|
#include "modules/desktop_capture/linux/x11/shared_x_display.h"
|
|
|
|
#include <X11/Xlib.h>
|
|
+#if !defined(WEBRTC_MOZILLA_BUILD)
|
|
#include <X11/extensions/XTest.h>
|
|
+#endif
|
|
|
|
#include <algorithm>
|
|
#include <cstddef>
|
|
@@ -98,6 +100,7 @@ void SharedXDisplay::ProcessPendingXEvents() {
|
|
}
|
|
|
|
void SharedXDisplay::IgnoreXServerGrabs() {
|
|
+#if !defined(WEBRTC_MOZILLA_BUILD)
|
|
int test_event_base = 0;
|
|
int test_error_base = 0;
|
|
int major = 0;
|
|
@@ -106,6 +109,7 @@ void SharedXDisplay::IgnoreXServerGrabs() {
|
|
&minor)) {
|
|
XTestGrabControl(display(), true);
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
} // namespace webrtc
|