Wire WebFonts intervention v2 for ECT of 3G

third_party/WebKit/Source/core/css/RemoteFontFaceSource.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 "core/css/RemoteFontFaceSource.h"
 
 #include "core/css/CSSCustomFontData.h"
 #include "core/css/CSSFontFace.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/Document.h"
@@ skipping 10 matching lines @@
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 namespace {
 
 bool isEffectiveConnectionTypeSlowFor(Document* document)
 {
     WebEffectiveConnectionType type = document->frame()->loader().client()->getEffectiveConnectionType();
 
-    WebEffectiveConnectionType thresholdType = RuntimeEnabledFeatures::webFontsInterventionV2With2GEnabled()
-        ? WebEffectiveConnectionType::Type2G
-        : WebEffectiveConnectionType::TypeSlow2G;
+    WebEffectiveConnectionType thresholdType = WebEffectiveConnectionType::TypeSlow2G;
+    if (RuntimeEnabledFeatures::webFontsInterventionV2With2GEnabled()) {
+        thresholdType = WebEffectiveConnectionType::Type2G;
+    } else if (RuntimeEnabledFeatures::webFontsInterventionV2With3GEnabled()) {
+        thresholdType = WebEffectiveConnectionType::Type3G;
+    } else {
+        NOTREACHED();

[Takashi Toyoshima, 2016/09/16 05:57:16]

This line seems to be reached when slow-2g is specified.

[tbansal1, 2016/09/16 06:45:27]

Done.

+    }
 
     return WebEffectiveConnectionType::TypeOffline <= type && type <= thresholdType;
 }
 
 bool isConnectionTypeSlow()
 {
     return networkStateNotifier().connectionType() == WebConnectionTypeCellular2G;
 }
 
 } // namespace
@@ skipping 119 matching lines @@
     m_period = FailurePeriod;
 }
 
 bool RemoteFontFaceSource::shouldTriggerWebFontsIntervention()
 {
     if (RuntimeEnabledFeatures::webFontsInterventionTriggerEnabled())
         return true;
     if (m_histograms.dataSource() == FontLoadHistograms::FromMemoryCache || m_histograms.dataSource() == FontLoadHistograms::FromDataURL)
         return false;
 
-    bool isV2Enabled = RuntimeEnabledFeatures::webFontsInterventionV2With2GEnabled() || RuntimeEnabledFeatures::webFontsInterventionV2WithSlow2GEnabled();
+    bool isV2Enabled = RuntimeEnabledFeatures::webFontsInterventionV2With3GEnabled() || RuntimeEnabledFeatures::webFontsInterventionV2With2GEnabled() || RuntimeEnabledFeatures::webFontsInterventionV2WithSlow2GEnabled();
 
     bool networkIsSlow = isV2Enabled ? isEffectiveConnectionTypeSlowFor(m_fontSelector->document()) : isConnectionTypeSlow();
 
     return networkIsSlow && m_display == FontDisplayAuto;
 }
 
 
 PassRefPtr<SimpleFontData> RemoteFontFaceSource::createFontData(const FontDescription& fontDescription)
 {
     if (!isLoaded())
@@ skipping 182 matching lines @@
         return Miss;
     case FromUnknown:
         // Fall through.
     default:
         NOTREACHED();
     }
     return Miss;
 }
 
 } // namespace blink