Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 52 insertions, 0 deletions

diff --git a/third_party/libwebrtc/moz-patch-stack/0071.patch b/third_party/libwebrtc/moz-patch-stack/0071.patch
new file mode 100644
index 0000000000..27ceba2306
--- /dev/null
+++ b/third_party/libwebrtc/moz-patch-stack/0071.patch
@@ -0,0 +1,52 @@
+From: Michael Froman <mfroman@mozilla.com>
+Date: Mon, 24 Oct 2022 13:00:00 -0500
+Subject: Bug 1797161 - pt1 - tweak BUILD.gn around task_queue_win usage. r?ng!
+
+Add assurance that we will not build task_queue_win.cc to avoid
+possible win32k API usage.
+
+Differential Revision: https://phabricator.services.mozilla.com/D160115
+Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f097eb8cbd8b7686ce306a46a4db691194fd39c1
+---
+ api/task_queue/BUILD.gn | 5 +++++
+ rtc_base/BUILD.gn       | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn
+index c9b4a5d0ec..1c342cb57e 100644
+--- a/api/task_queue/BUILD.gn
++++ b/api/task_queue/BUILD.gn
+@@ -30,6 +30,11 @@ rtc_library("task_queue") {
+   ]
+ }
+ 
++# Mozilla - we want to ensure that rtc_include_tests is set to false
++# to guarantee that default_task_queue_factory is not used so we
++# know that remaining win32k code in task_queue_win.cc is not built.
++# See Bug 1797161 for more info.
++assert(!rtc_include_tests, "Mozilla - verify rtc_include_tests is off")
+ if (rtc_include_tests) {
+ rtc_library("task_queue_test") {
+   visibility = [ "*" ]
+diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
+index 7e162cecbb..3cd0bfff06 100644
+--- a/rtc_base/BUILD.gn
++++ b/rtc_base/BUILD.gn
+@@ -686,10 +686,14 @@ if (is_mac || is_ios) {
+ if (is_win) {
+   rtc_library("rtc_task_queue_win") {
+     visibility = [ "../api/task_queue:default_task_queue_factory" ]
++# See Bug 1797161 for more info.  Remove from build until win32k
++# usage is removed.
++if (!build_with_mozilla) {
+     sources = [
+       "task_queue_win.cc",
+       "task_queue_win.h",
+     ]
++}
+     deps = [
+       ":checks",
+       ":logging",
+-- 
+2.34.1
+