Cache-aware Resource loading

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

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 87844840edb85a80b9c188695d2e0aa0de7adc67..958ce90824b4556b1d142b725a1a2a3a55f86e55 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -1173,6 +1173,16 @@ void ResourceFetcher::didFinishLoading(Resource* resource,
 
 void ResourceFetcher::didFailLoading(Resource* resource,
                                      const ResourceError& error) {
+  if (resource->loader()->isCacheAwareLoadingActivated() &&
+      error.isCacheMiss()) {
+    resource->willReloadAfterDiskCacheMiss();
+    resource->loader()->deactivateCacheAwareLoading();
+    resource->loader()->restart(resource->resourceRequest(),
+                                context().loadingTaskRunner(),
+                                context().defersLoading());
+    return;
+  }

[hiroshige, 2016/10/27 08:21:48]

Can we move this block to ResourceLoader::didFail() and make
ResourceLoader::deactivateCacheAwareLoading() private?
(Probably we can also make ResourceLoader::isCacheAwareLoadingActivated()
private)

[Shao-Chuan Lee, 2016/10/28 04:14:14]

Done.
As for isCacheAwareLoadingActivated() I'm planning to have it exposed to
Resource and ResourceClient.

+
   TRACE_EVENT_ASYNC_END0("blink.net", "Resource", resource->identifier());
   removeResourceLoader(resource->loader());
   m_resourceTimingInfoMap.take(const_cast<Resource*>(resource));
@@ -1284,6 +1294,10 @@ bool ResourceFetcher::startLoad(Resource* resource) {
   willSendRequest(resource->identifier(), request, ResourceResponse(),
                   resource->options());
 
+  // TODO(shaochuan): Saving modified ResourceRequest back to |resource|, remove
+  // once willSendRequest() takes const ResourceRequest. crbug.com/632580
+  resource->setResourceRequest(request);
+
   // Resource requests from suborigins should not be intercepted by the service
   // worker of the physical origin. This has the effect that, for now,
   // suborigins do not work with service workers. See
@@ -1300,6 +1314,15 @@ bool ResourceFetcher::startLoad(Resource* resource) {
 
   storeResourceTimingInitiatorInformation(resource);
   resource->setFetcherSecurityOrigin(sourceOrigin);
+
+  if (resource->options().cacheAwareLoadingEnabled ==
+      IsCacheAwareLoadingEnabled) {
+    // Call cache miss callback immediately if cache-aware loading is enabled
+    // but cannot be activated.
+    if (!loader->activateCacheAwareLoading(request))
+      resource->willReloadAfterDiskCacheMiss();
+  }

[hiroshige, 2016/10/27 08:21:48]

Can we move this block to ResourceLoader::start() and make
activateCacheAwareLoading() private?

[Shao-Chuan Lee, 2016/10/28 04:14:14]

The activation should only occur in startLoad(), if put in
ResourceLoader::start() it cannot determine whether it's called from startLoad()
or restart().

[hiroshige, 2016/10/31 08:25:19]

Makes sense. There might be a room for refactoring but it should not block this
issue.

+
   loader->start(request, context().loadingTaskRunner(),
                 context().defersLoading());
   return true;