aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2022-02-20 11:35:15 +0000
committerRene Ladan <rene@FreeBSD.org>2022-02-20 11:42:02 +0000
commita23dfd214ae04e8b4d116ca6411570b684eb5ed6 (patch)
treea42703b6563673398eee97ae6ad4d01eafd77738 /www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
parent9341f0aca4ecea11124957da5ea6384640745e43 (diff)
downloadports-a23dfd214ae04e8b4d116ca6411570b684eb5ed6.tar.gz
ports-a23dfd214ae04e8b4d116ca6411570b684eb5ed6.zip
www/chromium: update to 98.0.4758.102
- The port now uses the combined patch set for OpenBSD and FreeBSD maintained by Robert Nagy. - Fix build on i386 again. Obtained from: Robert Nagy <robert@openbsd.org> Security: https://vuxml.freebsd.org/freebsd/e12432af-8e73-11ec-8bc4-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/e852f43c-846e-11ec-b043-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc')
-rw-r--r--www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc30
1 files changed, 3 insertions, 27 deletions
diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
index 1e248c24ea4a..f02440d40794 100644
--- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
+++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
@@ -1,6 +1,6 @@
---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2021-12-14 11:45:06 UTC
+--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2022-02-07 13:39:41 UTC
+++ google_apis/gcm/engine/heartbeat_manager.cc
-@@ -32,13 +32,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;
+@@ -32,7 +32,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;
// Minimum time spent sleeping before we force a new heartbeat.
const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
@@ -9,13 +9,6 @@
// The period at which to check if the heartbeat time has passed. Used to
// protect against platforms where the timer is delayed by the system being
// suspended. Only needed on linux because the other OSes provide a standard
- // way to be notified of system suspend and resume events.
- const int kHeartbeatMissedCheckMs = 1000 * 60 * 5; // 5 minutes.
--#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
-
- } // namespace
-
@@ -192,7 +192,7 @@ void HeartbeatManager::RestartTimer() {
base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered,
weak_ptr_factory_.GetWeakPtr()));
@@ -25,16 +18,7 @@
// Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
// when the system is suspending or resuming. The only one that does not is
// Linux so we need to poll to check for missed heartbeats.
-@@ -201,7 +201,7 @@ void HeartbeatManager::RestartTimer() {
- base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
- weak_ptr_factory_.GetWeakPtr()),
- base::Milliseconds(kHeartbeatMissedCheckMs));
--#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
- }
-
- void HeartbeatManager::CheckForMissedHeartbeat() {
-@@ -217,14 +217,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
+@@ -217,7 +217,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
return;
}
@@ -43,11 +27,3 @@
// Otherwise check again later.
io_task_runner_->PostDelayedTask(
FROM_HERE,
- base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
- weak_ptr_factory_.GetWeakPtr()),
- base::Milliseconds(kHeartbeatMissedCheckMs));
--#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
- }
-
- void HeartbeatManager::UpdateHeartbeatInterval() {