Move |is_static_data| check down in DetermineRevalidationPolicy

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 882 matching lines @@
 
   // Never reuse opaque responses from a service worker for requests that are
   // not no-cors. https://crbug.com/625575
   if (existing_resource->GetResponse().WasFetchedViaServiceWorker() &&
       existing_resource->GetResponse().ServiceWorkerResponseType() ==
           kWebServiceWorkerResponseTypeOpaque &&
       request.GetFetchRequestMode() != WebURLRequest::kFetchRequestModeNoCORS) {
     return kReload;
   }
 
-  // If resource was populated from a SubstituteData load or data: url, use it.
-  if (is_static_data)
-    return kUse;
-
-  if (!existing_resource->CanReuse(fetch_params))
+  if (!is_static_data && !existing_resource->CanReuse(fetch_params))
     return kReload;
 
   // Certain requests (e.g., XHRs) might have manually set headers that require
   // revalidation. In theory, this should be a Revalidate case. In practice, the
   // MemoryCache revalidation path assumes a whole bunch of things about how
   // revalidation works that manual headers violate, so punt to Reload instead.
   //
   // Similarly, a request with manually added revalidation headers can lead to a
   // 304 response for a request that wasn't flagged as a revalidation attempt.
   // Normally, successful revalidation will maintain the original response's
   // status code, but for a manual revalidation the response code remains 304.
   // In this case, the Resource likely has insufficient context to provide a
   // useful cache hit or revalidation. See http://crbug.com/643659
-  if (request.IsConditional() ||
-      existing_resource->GetResponse().HttpStatusCode() == 304) {
+  if (!is_static_data &&
+      (request.IsConditional() ||
+       existing_resource->GetResponse().HttpStatusCode() == 304)) {
     return kReload;
   }
 
-  if (!fetch_params.Options().CanReuseRequest(existing_resource->Options()))
+  if (!is_static_data &&
+      !fetch_params.Options().CanReuseRequest(existing_resource->Options())) {
     return kReload;
+  }
 
   // Always use preloads.
   if (existing_resource->IsPreloaded())
     return kUse;
 
+  // If resource was populated from a SubstituteData load or data: url, use it.
+  if (is_static_data)
+    return kUse;
+
   // Don't reload resources while pasting.
   if (allow_stale_resources_)
     return kUse;
 
   // WebCachePolicy::ReturnCacheDataElseLoad uses the cache no matter what.
   if (request.GetCachePolicy() == WebCachePolicy::kReturnCacheDataElseLoad)
     return kUse;
 
   // Don't reuse resources with Cache-control: no-store.
   if (existing_resource->HasCacheControlNoStoreHeader()) {
@@ skipping 619 matching lines @@
   visitor->Trace(context_);
   visitor->Trace(archive_);
   visitor->Trace(loaders_);
   visitor->Trace(non_blocking_loaders_);
   visitor->Trace(document_resources_);
   visitor->Trace(preloads_);
   visitor->Trace(resource_timing_info_map_);
 }
 
 }  // namespace blink