Merge branch '6686-master-bank_app' into 'master'

0030-Partial-Revert-Guard-for-user-agent-reduction.patch

0031-Remove-webGL-site-setting.patch

0032-Browser-Remove-broken-link-about-entries.patch

0033-Revert-Remove-navigator.connection-info.patch

From 60c1bda41dd24faadc1df7544ea1237442e994ba Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Thu, 9 Mar 2023 05:34:47 +0000

Subject: [PATCH] Revert "Remove navigator.connection info"

This reverts commit de3bece5f8b98d17532dc73b485ad7574e8e0cb5.

---

 .../renderer/modules/netinfo/network_information.cc   |  5 +----

 .../platform/network/network_state_notifier.cc        | 11 -----------

 .../platform/network/network_state_notifier.h         |  2 +-

 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b/third_party/blink/renderer/modules/netinfo/network_information.cc

index 84fceb54b8d93..4a4455bb7fb73 100644

--- a/third_party/blink/renderer/modules/netinfo/network_information.cc

+++ b/third_party/blink/renderer/modules/netinfo/network_information.cc

@@ -61,7 +61,7 @@ NetworkInformation::~NetworkInformation() {

 }

 bool NetworkInformation::IsObserving() const {

-  return false;

+  return !!connection_observer_handle_;

 }

 String NetworkInformation::type() const {

@@ -147,7 +147,6 @@ void NetworkInformation::ConnectionChange(

     const absl::optional<base::TimeDelta>& transport_rtt,

     const absl::optional<double>& downlink_mbps,

     bool save_data) {

-  if ((true)) return;

   DCHECK(GetExecutionContext()->IsContextThread());

   const String host = Host();

@@ -243,7 +242,6 @@ void NetworkInformation::ContextDestroyed() {

 }

 void NetworkInformation::StartObserving() {

-  if ((true)) return;

   if (!IsObserving() && !context_stopped_) {

     type_ = GetNetworkStateNotifier().ConnectionType();

     DCHECK(!connection_observer_handle_);

@@ -254,7 +252,6 @@ void NetworkInformation::StartObserving() {

 }

 void NetworkInformation::StopObserving() {

-  if ((true)) return;

   if (IsObserving()) {

     DCHECK(connection_observer_handle_);

     connection_observer_handle_ = nullptr;

diff --git a/third_party/blink/renderer/platform/network/network_state_notifier.cc b/third_party/blink/renderer/platform/network/network_state_notifier.cc

index 6f88b8fe891d0..f4215fc1b1a0b 100644

--- a/third_party/blink/renderer/platform/network/network_state_notifier.cc

+++ b/third_party/blink/renderer/platform/network/network_state_notifier.cc

@@ -99,17 +99,6 @@ NetworkStateNotifier::ScopedNotifier::~ScopedNotifier() {

   }

 }

-NetworkStateNotifier::NetworkStateNotifier() : has_override_(false) {

-  // set default data

-  SetNetworkConnectionInfoOverride(

-    /*on_line*/ true,

-    /*type*/ WebConnectionType::kWebConnectionTypeWifi,

-    /*effective_type*/ absl::nullopt,

-    /*http_rtt_msec*/ 0,

-    /*max_bandwidth_mbps*/ std::numeric_limits<double>::max());

-  SetNetworkQuality(/*effective_type*/ WebEffectiveConnectionType::kType4G, base::TimeDelta(), base::TimeDelta(), 10000);

-}

-

 NetworkStateNotifier::NetworkStateObserverHandle::NetworkStateObserverHandle(

     NetworkStateNotifier* notifier,

     NetworkStateNotifier::ObserverType type,

diff --git a/third_party/blink/renderer/platform/network/network_state_notifier.h b/third_party/blink/renderer/platform/network/network_state_notifier.h

index b0e1bde264fc2..7159ec45636c2 100644

--- a/third_party/blink/renderer/platform/network/network_state_notifier.h

+++ b/third_party/blink/renderer/platform/network/network_state_notifier.h

@@ -122,7 +122,7 @@ class PLATFORM_EXPORT NetworkStateNotifier {

     scoped_refptr<base::SingleThreadTaskRunner> task_runner_;

   };

-  NetworkStateNotifier();

+  NetworkStateNotifier() : has_override_(false) {}

   NetworkStateNotifier(const NetworkStateNotifier&) = delete;

   NetworkStateNotifier& operator=(const NetworkStateNotifier&) = delete;

-- 

2.25.1