From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:43:14 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 netwerk/base/NetworkConnectivityService.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'netwerk/base/NetworkConnectivityService.h')

diff --git a/netwerk/base/NetworkConnectivityService.h b/netwerk/base/NetworkConnectivityService.h
index 6315fb192b..b29825d5d5 100644
--- a/netwerk/base/NetworkConnectivityService.h
+++ b/netwerk/base/NetworkConnectivityService.h
@@ -33,7 +33,7 @@ class NetworkConnectivityService : public nsINetworkConnectivityService,
   static already_AddRefed<NetworkConnectivityService> GetSingleton();
 
  private:
-  NetworkConnectivityService();
+  NetworkConnectivityService() = default;
   virtual ~NetworkConnectivityService() = default;
 
   nsresult Init();
@@ -47,18 +47,20 @@ class NetworkConnectivityService : public nsINetworkConnectivityService,
   // Will be set to OK if the DNS request returned in IP of this type,
   //                NOT_AVAILABLE if that type of resolution is not available
   //                UNKNOWN if the check wasn't performed
-  Atomic<ConnectivityState, Relaxed> mDNSv4;
-  Atomic<ConnectivityState, Relaxed> mDNSv6;
+  Atomic<ConnectivityState, Relaxed> mDNSv4{ConnectivityState::UNKNOWN};
+  Atomic<ConnectivityState, Relaxed> mDNSv6{ConnectivityState::UNKNOWN};
+  Atomic<ConnectivityState, Relaxed> mDNS_HTTPS{ConnectivityState::UNKNOWN};
 
-  Atomic<ConnectivityState, Relaxed> mIPv4;
-  Atomic<ConnectivityState, Relaxed> mIPv6;
+  Atomic<ConnectivityState, Relaxed> mIPv4{ConnectivityState::UNKNOWN};
+  Atomic<ConnectivityState, Relaxed> mIPv6{ConnectivityState::UNKNOWN};
 
-  Atomic<ConnectivityState, Relaxed> mNAT64;
+  Atomic<ConnectivityState, Relaxed> mNAT64{ConnectivityState::UNKNOWN};
 
-  nsTArray<NetAddr> mNAT64Prefixes;
+  nsTArray<NetAddr> mNAT64Prefixes{ConnectivityState::UNKNOWN};
 
   nsCOMPtr<nsICancelable> mDNSv4Request;
   nsCOMPtr<nsICancelable> mDNSv6Request;
+  nsCOMPtr<nsICancelable> mDNS_HTTPSRequest;
   nsCOMPtr<nsICancelable> mNAT64Request;
 
   nsCOMPtr<nsIChannel> mIPv4Channel;
@@ -67,7 +69,7 @@ class NetworkConnectivityService : public nsINetworkConnectivityService,
   bool mCheckedNetworkId = false;
   bool mHasNetworkId = false;
 
-  Mutex mLock MOZ_UNANNOTATED;
+  Mutex mLock MOZ_UNANNOTATED{"nat64prefixes"};
 };
 
 }  // namespace net
-- 
cgit v1.2.3