Pages controlled by ServiceWorkers should not participate in AppCaching

content/browser/appcache/appcache_request_handler.cc

 // Copyright (c) 2011 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/appcache/appcache_request_handler.h"
 
 #include "content/browser/appcache/appcache.h"
 #include "content/browser/appcache/appcache_backend_impl.h"
 #include "content/browser/appcache/appcache_policy.h"
 #include "content/browser/appcache/appcache_url_request_job.h"
+#include "content/browser/service_worker/service_worker_request_handler.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
 namespace content {
 
 AppCacheRequestHandler::AppCacheRequestHandler(AppCacheHost* host,
                                                ResourceType resource_type)
     : host_(host),
       resource_type_(resource_type),
       is_waiting_for_cache_selection_(false),
@@ skipping 210 matching lines @@
   job_->DeliverNetworkResponse();
 }
 
 // Main-resource handling ----------------------------------------------
 
 void AppCacheRequestHandler::MaybeLoadMainResource(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) {
   DCHECK(!job_.get());
   DCHECK(host_);
 
+  // If a page falls into the scope of a ServiceWorker, any matching AppCaches
+  // should be ignored. This depends on the ServiceWorker handler being invoked
+  // prior to the AppCache handler.

[michaeln, 2014/10/03 01:09:46]

bah... the ordering is wrong, appcache gets called first :(

+  if (ServiceWorkerRequestHandler::IsControlledByServiceWorker(request)) {
+    host_->enable_cache_selection(false);
+    return;
+  }
+
+  host_->enable_cache_selection(true);
+
   const AppCacheHost* spawning_host =
       (resource_type_ == RESOURCE_TYPE_SHARED_WORKER) ?
       host_ : host_->GetSpawningHost();
   GURL preferred_manifest_url = spawning_host ?
       spawning_host->preferred_manifest_url() : GURL();
 
   // We may have to wait for our storage query to complete, but
   // this query can also complete syncrhonously.
   job_ = new AppCacheURLRequestJob(request, network_delegate,
                                    storage(), host_, is_main_resource());
@@ skipping 146 matching lines @@
   if (!host_->associated_cache() ||
       !host_->associated_cache()->is_complete()) {
     DeliverNetworkResponse();
     return;
   }
 
   ContinueMaybeLoadSubResource();
 }
 
 }  // namespace content