[WIP] WebFonts cache-aware timeout adaption

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

Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index 8bd7d64800e99597db1e03ccd947c856ab66723c..66334ff8d5425331481d8019ff9bd8adbf623846 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -416,6 +416,8 @@ void Resource::error(const ResourceError& error) {
 
 void Resource::finish(double loadFinishTime) {
   DCHECK(!m_isRevalidating);
+  if (m_resourceRequest.isCacheAwareLoadingActivated())
+    m_resourceRequest.deactivateCacheAwareLoading();
   m_loadFinishTime = loadFinishTime;
   if (!errorOccurred())
     m_status = Cached;
@@ -554,6 +556,8 @@ void Resource::willFollowRedirect(ResourceRequest& newRequest,
                                   const ResourceResponse& redirectResponse) {
   if (m_isRevalidating)
     revalidationFailed();
+  if (m_resourceRequest.isCacheAwareLoadingActivated())
+    m_resourceRequest.deactivateCacheAwareLoading();
   m_redirectChain.append(RedirectPair(newRequest, redirectResponse));
 }