Index: third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp |
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp |
index 6a88cbe223d3a28d1510ec6cb5bf1bc2700cdbaf..e11181ddaa5beb95a703e9fa2a845d64728346b9 100644 |
--- a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp |
+++ b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp |
@@ -35,6 +35,7 @@ |
#include "core/fetch/ResourceFetcher.h" |
#include "core/loader/MixedContentChecker.h" |
#include "platform/CrossOriginAttributeValue.h" |
+#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/fonts/FontCache.h" |
#include "platform/fonts/FontCustomPlatformData.h" |
#include "platform/weborigin/SecurityPolicy.h" |
@@ -86,8 +87,10 @@ static void setCrossOriginAccessControl(FetchRequest& request, |
FontResource* CSSFontFaceSrcValue::fetch(Document* document) const { |
if (!m_fetched) { |
- FetchRequest request(ResourceRequest(m_absoluteResource), |
- FetchInitiatorTypeNames::css); |
+ ResourceRequest resourceRequest(m_absoluteResource); |
+ resourceRequest.setIsCacheAwareLoadingEnabled( |
+ RuntimeEnabledFeatures::webFontsCacheAwareTimeoutAdaptionEnabled()); |
+ FetchRequest request(resourceRequest, FetchInitiatorTypeNames::css); |
request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy); |
SecurityOrigin* securityOrigin = document->getSecurityOrigin(); |
setCrossOriginAccessControl(request, securityOrigin); |