ServiceWorker: Set provider host document URL for no-cache load.

content/browser/service_worker/service_worker_controllee_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_controllee_request_handler.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_registration.h"
 #include "content/browser/service_worker/service_worker_url_request_job.h"
@@ skipping 27 matching lines @@
     if (is_main_resource_load_)
       provider_host_->active_version()->ScheduleUpdate();
     else
       provider_host_->active_version()->DeferScheduledUpdate();
   }
 }
 
 net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) {
+  if (is_main_resource_load_ && provider_host_)
+    provider_host_->SetDocumentUrl(request->url());
+
   if (!context_ || !provider_host_ ||
       request->load_flags() & net::LOAD_BYPASS_CACHE) {

[michaeln, 2014/07/02 18:40:30]

might make sense to split the BYPASS condition out of this first early exit case
since its really of a different nature and we want to do other stuff in that
case too

if (BYPASS) {
  if (main_load)
    SetDocUrl(SimplifyUrlForRequest(url));
  job_= NULL;
  reuturn NULL;
}

     // We can't do anything other than to fall back to network.
     job_ = NULL;
     return NULL;
   }
 
   // This may get called multiple times for original and redirect requests:
   // A. original request case: job_ is null, no previous location info.
   // B. redirect or restarted request case:
   //  a) job_ is non-null if the previous location was forwarded to SW.
   //  b) job_ is null if the previous location was fallback.
@@ skipping 30 matching lines @@
 void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
     const GURL& url) {
   DCHECK(job_.get());
   DCHECK(context_);
   // The corresponding provider_host may already have associate version in
   // redirect case, unassociate it now.
   provider_host_->SetActiveVersion(NULL);
   provider_host_->SetWaitingVersion(NULL);
 
   GURL stripped_url = net::SimplifyUrlForRequest(url);
-  provider_host_->SetDocumentUrl(stripped_url);

[michaeln, 2014/07/02 18:40:30]

probably should continue to pass in a stripped_url

   context_->storage()->FindRegistrationForDocument(
       stripped_url,
       base::Bind(&self::DidLookupRegistrationForMainResource,
                  weak_factory_.GetWeakPtr()));
 }
 
 void
 ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
     ServiceWorkerStatusCode status,
     const scoped_refptr<ServiceWorkerRegistration>& registration) {
@@ skipping 13 matching lines @@
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_->active_version());
   job_->ForwardToServiceWorker();
 }
 
 }  // namespace content