[WIP] WebFonts cache-aware timeout adaption

third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

Index: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
index 61b47c7850574d477ef9884ff14fd704ad6d9155..34e37ec5ead23ba0f56a46ba3cb8d2900884f7d8 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
@@ -137,6 +137,12 @@ bool ResourceLoader::willFollowRedirect(
   DCHECK(!passedNewRequest.isNull());
   DCHECK(!passedRedirectResponse.isNull());
 
+  if (m_resource->resourceRequest().isCacheAwareLoadingActivated()) {
+    // Fail as disk cache miss and retry in ResourceFetcher::didFailLoading().
+    didFail(nullptr, WebURLError::cacheMissError());

[kinuko, 2016/10/22 04:43:01]

nit: I think we'd better create ResourceError here and pass it to didFail?  (See
how other code in this class is calling didFail). WebURLError is an interface
for exposing ResourceError created inside blink to embedders outside blink, and
we're inside blink.

[Shao-Chuan Lee, 2016/10/25 04:18:20]

I've noticed that other places pass ResourceError to didFail(), but it's
converted to WebURLError and back to ResourceError immediately when passing to
ResourceFetcher, I wonder if I should follow existing code.

+    return false;
+  }
+
   ResourceRequest& newRequest(passedNewRequest.toMutableResourceRequest());
   const ResourceResponse& redirectResponse(
       passedRedirectResponse.toResourceResponse());