[WIP] WebFonts cache-aware timeout adaption

third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp

 /*
  * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 
 #include "core/css/CSSMarkup.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/FontResource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/loader/MixedContentChecker.h"
 #include "platform/CrossOriginAttributeValue.h"

[Takashi Toyoshima, 2016/10/05 07:06:18]

#include "platform/RuntimeEnabledFeatures.h"

The file is autogened at <build-dir>/gen/blink/...

[Shao-Chuan Lee, 2016/10/05 10:16:10]

Done.

 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontCustomPlatformData.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 bool CSSFontFaceSrcValue::isSupportedFormat() const {
   // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face,
   // we will also check to see if the URL ends with .eot.  If so, we'll go ahead and assume that we shouldn't load it.
@@ skipping 33 matching lines @@
     return;
 
   request.setCrossOriginAccessControl(securityOrigin,
                                       CrossOriginAttributeAnonymous);
 }
 
 FontResource* CSSFontFaceSrcValue::fetch(Document* document) const {
   if (!m_fetched) {
     FetchRequest request(ResourceRequest(m_absoluteResource),
                          FetchInitiatorTypeNames::css);
+    request.mutableResourceRequest().setIsCacheAwareLoadingEnabled(
+        RuntimeEnabledFeatures::webFontsCacheAwareTimeoutAdaptionEnabled());

[hiroshige, 2016/10/05 08:27:10]

Could you write like this?

ResourceRequest resourceRequest(m_absoluteResource);
resourceRequest.setIsCacheAwareLoadingEnabled(...);
FetchRequest request(resourceRequest, ...);

This is to reduce unnecessary mutableResourceRequest() calls.

[Shao-Chuan Lee, 2016/10/05 10:16:10]

Done.

     request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);
     SecurityOrigin* securityOrigin = document->getSecurityOrigin();
     setCrossOriginAccessControl(request, securityOrigin);
     request.mutableResourceRequest().setHTTPReferrer(
         SecurityPolicy::generateReferrer(m_referrer.referrerPolicy,
                                          request.url(), m_referrer.referrer));
     FontResource* resource = FontResource::fetch(request, document->fetcher());
     if (!resource)
       return nullptr;
     m_fetched = FontResourceHelper::create(resource);
@@ skipping 28 matching lines @@
       ResourceFetcher::ResourceLoadingFromCache);
 }
 
 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const {
   return m_isLocal == other.m_isLocal && m_format == other.m_format &&
          m_specifiedResource == other.m_specifiedResource &&
          m_absoluteResource == other.m_absoluteResource;
 }
 
 }  // namespace blink