Lower the webfont loading priority only if the user is in V2 field trial

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 31 matching lines @@
   DCHECK_NE(WebEffectiveConnectionType::TypeUnknown, thresholdType);
 
   return WebEffectiveConnectionType::TypeOffline <= type &&
          type <= thresholdType;
 }
 
 bool isConnectionTypeSlow() {
   return networkStateNotifier().connectionType() == WebConnectionTypeCellular2G;
 }
 
+bool isInterventionV2Enabled() {
+  return RuntimeEnabledFeatures::webFontsInterventionV2With2GEnabled() ||
+         RuntimeEnabledFeatures::webFontsInterventionV2With3GEnabled() ||
+         RuntimeEnabledFeatures::webFontsInterventionV2WithSlow2GEnabled();
+}
+
 }  // namespace
 
 RemoteFontFaceSource::RemoteFontFaceSource(FontResource* font,
                                            CSSFontSelector* fontSelector,
                                            FontDisplay display)
     : m_font(font),
       m_fontSelector(fontSelector),
       m_display(display),
       m_period(display == FontDisplaySwap ? SwapPeriod : BlockPeriod),
       m_histograms(font->url().protocolIsData()
@@ 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::webFontsInterventionV2With3GEnabled() ||
-      RuntimeEnabledFeatures::webFontsInterventionV2WithSlow2GEnabled();
-
   bool networkIsSlow =
-      isV2Enabled ? isEffectiveConnectionTypeSlowFor(m_fontSelector->document())
-                  : isConnectionTypeSlow();
+      isInterventionV2Enabled()
+          ? isEffectiveConnectionTypeSlowFor(m_fontSelector->document())
+          : isConnectionTypeSlow();
 
   return networkIsSlow && m_display == FontDisplayAuto;
 }
 
 bool RemoteFontFaceSource::isLowPriorityLoadingAllowedForRemoteFont() const {
-  return m_isInterventionTriggered;
+  return m_isInterventionTriggered && isInterventionV2Enabled();
 }
 
 PassRefPtr<SimpleFontData> RemoteFontFaceSource::createFontData(
     const FontDescription& fontDescription) {
   if (!isLoaded())
     return createLoadingFallbackFontData(fontDescription);
 
   if (!m_font->ensureCustomFontData() || m_period == FailurePeriod)
     return nullptr;
 
@@ skipping 251 matching lines @@
       return Miss;
     case FromUnknown:
     // Fall through.
     default:
       NOTREACHED();
   }
   return Miss;
 }
 
 }  // namespace blink