Service Worker: Change last update check location and HTTP cache bypass rule (2/2)

content/browser/service_worker/service_worker_context_request_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_context_request_handler.h"
 
 #include "base/time/time.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_read_from_cache_job.h"
@@ skipping 46 matching lines @@
 
   if (ShouldAddToScriptCache(request->url())) {
     ServiceWorkerRegistration* registration =
         context_->GetLiveRegistration(version_->registration_id());
     DCHECK(registration);  // We're registering or updating so must be there.
 
     int64 response_id = context_->storage()->NewResourceId();
     if (response_id == kInvalidServiceWorkerResponseId)
       return NULL;
 
-    // Bypass the browser cache for initial installs and update
-    // checks after 24 hours have passed.
+    // Bypass the browser cache for initial installs and update checks after
+    // min(Cache-Control's max-age value, 86400) seconds have passed.
     int extra_load_flags = 0;
     base::TimeDelta time_since_last_check =
         base::Time::Now() - registration->last_update_check();
-    if (time_since_last_check > base::TimeDelta::FromHours(
-                                    kServiceWorkerScriptMaxCacheAgeInHours) ||
-        version_->force_bypass_cache_for_scripts()) {
+    if (time_since_last_check > version_->max_age() ||

[nhiroki, 2015/08/19 06:59:01]

The original code (time_since_last_check > FromHours(24)) could work for the
latest spec because the max-age is recorded in the HTTP Cache and a network
request can bypass the cache regardless of the bypass flag when the max-age
passed.

[jungkees, 2015/08/20 01:52:56]

Agreed on your point. Having double-checked the logic, the original code should
have been attained the same result.

So, depending on the need/decision of the service worker's max age concept for
scheduled updates, let me apply a relevant code for this part.

+        version_->force_bypass_cache_for_scripts())
       extra_load_flags = net::LOAD_BYPASS_CACHE;
-    }
 
     ServiceWorkerVersion* stored_version = registration->waiting_version()
                                                ? registration->waiting_version()
                                                : registration->active_version();
     int64 incumbent_response_id = kInvalidServiceWorkerResourceId;
     if (stored_version && stored_version->script_url() == request->url()) {
       incumbent_response_id =
           stored_version->script_cache_map()->LookupResourceId(request->url());
     }
     return new ServiceWorkerWriteToCacheJob(
@@ skipping 35 matching lines @@
     const GURL& url, int64* response_id_out) {
   // We don't read from the script cache until the version is INSTALLED.
   if (version_->status() == ServiceWorkerVersion::NEW ||
       version_->status() == ServiceWorkerVersion::INSTALLING)
     return false;
   *response_id_out = version_->script_cache_map()->LookupResourceId(url);
   return *response_id_out != kInvalidServiceWorkerResponseId;
 }
 
 }  // namespace content