third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp - Issue 2349593002: Wire WebFonts intervention v2 for ECT of 3G

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

Issue 2349593002: Wire WebFonts intervention v2 for ECT of 3G (Closed)

Patch Set: Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/app/generated_resources.grd ('K') | « content/public/common/content_switches.cc ('k') | third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

index bc8679008f97652d10bf4a54c174a0103c228c7f..78e012c18eccee3ca5a155faa6736d9768e15eec 100644

--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp

@@ -28,9 +28,14 @@ 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 spec

tbansal1 2016/09/16 06:45:27 Done.

+ }

return WebEffectiveConnectionType::TypeOffline <= type && type <= thresholdType;

}

@@ -170,7 +175,7 @@ bool RemoteFontFaceSource::shouldTriggerWebFontsIntervention()

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();