diff options
| author | Matthias Wolf <matthias@rheinwolf.de> | 2021-06-17 09:22:35 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-06-17 09:32:02 +0000 |
| commit | 9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0 (patch) | |
| tree | bd5ba927b4a7b2e0fc9aeef18b17d738079b2edd /www/chromium/files/patch-remoting_host_remoting__me2me__host.cc | |
| parent | ccd805d32e3522eee71501f122f41f59f99fd1b5 (diff) | |
| download | ports-9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0.tar.gz ports-9c8545d7801e5a5b68dd4c68d5f0dcb7109015d0.zip | |
www/chromium: update to 91.0.4472.101
Security: https://vuxml.freebsd.org/freebsd/20b3ab21-c9df-11eb-8558-3065ec8fd3ec.html
(cherry picked from commit 06317815238060a3a7f5911f18a3dd7c95779c83)
Diffstat (limited to 'www/chromium/files/patch-remoting_host_remoting__me2me__host.cc')
| -rw-r--r-- | www/chromium/files/patch-remoting_host_remoting__me2me__host.cc | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index abcc2d84678c..0eb49af0ad5f 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -120,14 +120,14 @@ +@@ -119,7 +119,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) @@ -9,9 +9,10 @@ #include <gtk/gtk.h> #include "base/linux_util.h" - #include "remoting/host/audio_capturer_linux.h" +@@ -127,7 +127,7 @@ #include "remoting/host/linux/certificate_watcher.h" #include "ui/events/platform/x11/x11_event_source.h" + #include "ui/gfx/x/xlib_support.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -82,6 +83,38 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - std::unique_ptr<ui::X11EventSource> event_source; - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - kReportOfflineReasonSwitchName)) { + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) + x11::InitXlib(); +@@ -1800,7 +1800,7 @@ int HostProcessMain() { + std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( + net::NetworkChangeNotifier::CreateIfNeeded()); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Create an X11EventSource on all UI threads, so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. + auto event_source = +@@ -1809,7 +1809,7 @@ int HostProcessMain() { + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + new ui::X11EventSource(x11::Connection::Get()); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Create & start the HostProcess using these threads. + // TODO(wez): The HostProcess holds a reference to itself until Shutdown(). +@@ -1822,11 +1822,11 @@ int HostProcessMain() { + // Run the main (also UI) task executor until the host no longer needs it. + run_loop.Run(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Block until tasks blocking shutdown have completed their execution. + base::ThreadPoolInstance::Get()->Shutdown(); |