ServiceWorker: Fix matching registration info missing during shift-reload.

content/browser/service_worker/service_worker_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_request_handler.h"
 
 #include <string>
 
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_url_request_job.h"
 #include "content/browser/service_worker/service_worker_utils.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/resource_context.h"
+#include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "storage/browser/blob/blob_storage_context.h"
 
 namespace content {
 
 namespace {
 
 int kUserDataKey;  // Key value is not important.
@@ skipping 45 matching lines @@
 
   ServiceWorkerProviderHost* provider_host =
       context_wrapper->context()->GetProviderHost(process_id, provider_id);
   if (!provider_host || !provider_host->IsContextAlive())
     return;
 
   if (skip_service_worker) {
     if (ServiceWorkerUtils::IsMainResourceType(resource_type)) {
       provider_host->SetDocumentUrl(net::SimplifyUrlForRequest(request->url()));
       provider_host->SetTopmostFrameUrl(request->first_party_for_cookies());
+      // A page load with skip_service_worker should be triggered by
+      // shift-reload, so retain all live matching registrations.
+      DCHECK(request->load_flags() & net::LOAD_BYPASS_CACHE);

[michaeln, 2015/06/24 19:47:22]

I'm not sure the dcheck is really appropriate, seems like it could make sense to
skip a registered sw w/o busting the http cache? The dcheck implies that its not
ok for that to happen, but why?

[xiang, 2015/06/25 05:37:32]

The dcheck is on the assumption that when a main resource load happened with
skip sw, the load should be triggered by shift-reload. As shift-reload has
LOAD_BY_PASS_CACHE specified, we can double check it here.

I feel it's OK to remove this dcheck as long as AddMatchingRegistrations doesn't
make any bad side effect.

+      provider_host->CopyMatchingRegistrations();
     }
     return;
   }
 
   scoped_ptr<ServiceWorkerRequestHandler> handler(
       provider_host->CreateRequestHandler(request_mode,
                                           credentials_mode,
                                           resource_type,
                                           request_context_type,
                                           frame_type,
@@ skipping 70 matching lines @@
     ResourceType resource_type)
     : context_(context),
       provider_host_(provider_host),
       blob_storage_context_(blob_storage_context),
       resource_type_(resource_type),
       old_process_id_(0),
       old_provider_id_(kInvalidServiceWorkerProviderId) {
 }
 
 }  // namespace content