Expose ECT to render frames, Blink and NetInfo

third_party/WebKit/Source/modules/netinfo/NetworkInformation.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/netinfo/NetworkInformation.h"
 
 #include <limits>
 
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/TaskRunnerHelper.h"
@@ skipping 24 matching lines @@
       return "other";
     case kWebConnectionTypeNone:
       return "none";
     case kWebConnectionTypeUnknown:
       return "unknown";
   }
   NOTREACHED();
   return "none";
 }
 
+String EffectiveConnectionTypeToString(WebEffectiveConnectionType type) {
+  switch (type) {
+    case WebEffectiveConnectionType::kTypeUnknown:
+    case WebEffectiveConnectionType::kTypeOffline:
+    case WebEffectiveConnectionType::kType4G:
+      return "4g";
+    case WebEffectiveConnectionType::kTypeSlow2G:
+      return "slow-2g";
+    case WebEffectiveConnectionType::kType2G:
+      return "2g";
+    case WebEffectiveConnectionType::kType3G:
+      return "3g";
+  }
+  NOTREACHED();
+  return "4g";
+}
+
 // Rounds |rtt_msec| to the nearest 25 milliseconds as per the NetInfo spec.
 unsigned long RoundRtt(const Optional<TimeDelta>& rtt) {
   if (!rtt.has_value()) {
     // RTT is unavailable. So, return the fastest value.
     return 0;
   }
 
   int rtt_msec = rtt.value().InMilliseconds();
   if (rtt.value().InMilliseconds() > std::numeric_limits<int>::max())
     rtt_msec = std::numeric_limits<int>::max();
@@ skipping 20 matching lines @@
 
 NetworkInformation* NetworkInformation::Create(ExecutionContext* context) {
   return new NetworkInformation(context);
 }
 
 NetworkInformation::~NetworkInformation() {
   DCHECK(!observing_);
 }
 
 String NetworkInformation::type() const {
-  // m_type is only updated when listening for events, so ask
+  // type_ is only updated when listening for events, so ask
   // networkStateNotifier if not listening (crbug.com/379841).
   if (!observing_)
     return ConnectionTypeToString(GetNetworkStateNotifier().ConnectionType());
 
   // If observing, return m_type which changes when the event fires, per spec.
   return ConnectionTypeToString(type_);
 }
 
 double NetworkInformation::downlinkMax() const {
   if (!observing_)
     return GetNetworkStateNotifier().MaxBandwidth();
 
   return downlink_max_mbps_;
 }
 
+String NetworkInformation::effectiveType() const {
+  // effective_type_ is only updated when listening for events, so ask
+  // networkStateNotifier if not listening (crbug.com/379841).
+  if (!observing_) {
+    return EffectiveConnectionTypeToString(
+        GetNetworkStateNotifier().EffectiveType());
+  }
+
+  // If observing, return m_type which changes when the event fires, per spec.
+  return EffectiveConnectionTypeToString(effective_type_);
+}
+
 unsigned long NetworkInformation::rtt() const {
   if (!observing_)
     return RoundRtt(GetNetworkStateNotifier().TransportRtt());
 
   return transport_rtt_msec_;
 }
 
 double NetworkInformation::downlink() const {
   if (!observing_)
     return RoundMbps(GetNetworkStateNotifier().DownlinkThroughputMbps());
 
   return downlink_mbps_;
 }
 
 void NetworkInformation::ConnectionChange(
     WebConnectionType type,
     double downlink_max_mbps,
+    WebEffectiveConnectionType effective_type,
     const Optional<TimeDelta>& http_rtt,
     const Optional<TimeDelta>& transport_rtt,
     const Optional<double>& downlink_mbps) {
   DCHECK(GetExecutionContext()->IsContextThread());
 
+  effective_type_ = effective_type;
   transport_rtt_msec_ = RoundRtt(transport_rtt);
   downlink_mbps_ = RoundMbps(downlink_mbps);
   // TODO(tbansal): https://crbug.com/719108. Dispatch |change| event if the
   // expected network quality has changed.
 
   // This can happen if the observer removes and then adds itself again
   // during notification, or if HTTP RTT was the only metric that changed.
   if (type_ == type && downlink_max_mbps_ == downlink_max_mbps)
     return;
 
@@ skipping 64 matching lines @@
         this,
         TaskRunnerHelper::Get(TaskType::kNetworking, GetExecutionContext()));
     observing_ = false;
   }
 }
 
 NetworkInformation::NetworkInformation(ExecutionContext* context)
     : ContextLifecycleObserver(context),
       type_(GetNetworkStateNotifier().ConnectionType()),
       downlink_max_mbps_(GetNetworkStateNotifier().MaxBandwidth()),
+      effective_type_(GetNetworkStateNotifier().EffectiveType()),
       transport_rtt_msec_(RoundRtt(GetNetworkStateNotifier().TransportRtt())),
       downlink_mbps_(
           RoundMbps(GetNetworkStateNotifier().DownlinkThroughputMbps())),
       observing_(false),
       context_stopped_(false) {}
 
 DEFINE_TRACE(NetworkInformation) {
   EventTargetWithInlineData::Trace(visitor);
   ContextLifecycleObserver::Trace(visitor);
 }
 
 }  // namespace blink