diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-01-27 21:01:06 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-01-27 21:01:06 +0000 |
commit | a04e75e95a0d8a508afd0f8a4d1e05b8bca29655 (patch) | |
tree | e3b89e99a71056314a4d5efc01905b12186e03cc /www/chromium/files/patch-remoting_host_remoting__me2me__host.cc | |
parent | net/librdkafka: update to 1.6.0 (diff) |
www/chromium: update to 88.0.4324.96
Submitted by: Matthias Wolf (via github)
MFH: 2021Q1
Security: https://www.vuxml.org/freebsd/4ed0e43c-5cef-11eb-bafd-3065ec8fd3ec.html
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 | 21 |
1 files changed, 10 insertions, 11 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 92a68a4d2586..425214016736 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 2020-11-13 06:36:46 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-01-18 21:29:02 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -118,7 +118,7 @@ +@@ -118,14 +118,14 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) @@ -9,16 +9,15 @@ #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -126,7 +126,7 @@ + #include "remoting/host/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" #include "ui/events/platform/x11/x11_event_source.h" - #include "ui/gfx/x/x11.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_WIN) #include <commctrl.h> -@@ -161,11 +161,11 @@ const char kApplicationName[] = "chromoting"; +@@ -160,11 +160,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -41,7 +40,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -761,7 +761,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -50,7 +49,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, this, -@@ -848,7 +848,7 @@ void HostProcess::StartOnUiThread() { +@@ -850,7 +850,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -59,7 +58,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -857,7 +857,7 @@ void HostProcess::StartOnUiThread() { +@@ -859,7 +859,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -68,7 +67,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -906,7 +906,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -908,7 +908,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -77,7 +76,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1512,7 +1512,7 @@ void HostProcess::StartHost() { +@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -86,7 +85,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1687,7 +1687,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1722,7 +1722,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); |