ResourceFetcher: fix an assertion failure on defered resource revalidation

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 2be06c9702689abd40bcb22dd54bd63264a9e820..6c2492b923fabc4ee15c98ead676777f266501dc 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -511,6 +511,10 @@ Resource* ResourceFetcher::requestResource(FetchRequest& request, const Resource
     requestLoadStarted(resource, request, policy == Use ? ResourceLoadingFromCache : ResourceLoadingFromNetwork, isStaticData);
     m_documentResources.set(urlWithoutFragment, resource);
 
+    // Returns with an existing resource if the resource does not need to start
+    // loading immediately.
+    // If revalidation policy was determined as |Revalidate|, the resource was
+    // already initialized for the revalidation here, but won't start loading.
     if (!resourceNeedsLoad(resource, request, policy))
         return resource;
 
@@ -795,8 +799,15 @@ ResourceFetcher::RevalidationPolicy ResourceFetcher::determineRevalidationPolicy
         || request.cacheControlContainsNoCache()) {
         // See if the resource has usable ETag or Last-modified headers.
         // If the page is controlled by the ServiceWorker, we choose the Reload policy because the revalidation headers should not be exposed to the ServiceWorker.(crbug.com/429570)
-        if (existingResource->canUseCacheValidator() && !context().isControlledByServiceWorker())
+        if (existingResource->canUseCacheValidator() && !context().isControlledByServiceWorker()) {
+            // If the resource is already a cache validator but not started yet,
+            // the |Use| policy should be applied to subsequent requests.
+            if (existingResource->isCacheValidator()) {
+                DCHECK(existingResource->stillNeedsLoad());

[Takashi Toyoshima, 2016/06/06 13:14:19]

existingResource->canUseCacheValidator() ensures the Status is not Pending, and
not Load/DecodeError. Also, we already have a check that confirms
m_revalidatingRequest.isNull() is true on changing the Status to Cached. So,
here the Status should be always NotStarted until we make another change that
breaks this assumption.

+                return Use;
+            }
             return Revalidate;
+        }
 
         // No, must reload.
         WTF_LOG(ResourceLoading, "ResourceFetcher::determineRevalidationPolicy reloading due to missing cache validators.");