Set skip_service_worker in ServiceWorkerControlleeRequestHandler only for subresource requests.

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 "base/trace_event/trace_event.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_metrics.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
@@ skipping 68 matching lines @@
 
   // 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.
   //  c) job_ is non-null if additional restart was required to fall back.
 
   // We've come here by restart, we already have original request and it
   // tells we should fallback to network. (Case B-c)
-  // Once the request was fallbacked to the network, skip-service-worker flag
-  // must be set and the request shoud not go to the service worker.
   if ((job_.get() && job_->ShouldFallbackToNetwork()) || skip_service_worker_) {
-    skip_service_worker_ = true;
+    // Once a subresource request was fallbacked to the network, we set
+    // |skip_service_worker_| and the request shoud not go to the service
+    // worker.
+    if (!is_main_resource_load_)
+      skip_service_worker_ = true;
     job_ = NULL;
     return NULL;
   }
 
   // It's for original request (A) or redirect case (B-a or B-b).
   DCHECK(!job_.get() || job_->ShouldForwardToServiceWorker());
 
   job_ = new ServiceWorkerURLRequestJob(
       request, network_delegate, provider_host_, blob_storage_context_,
       resource_context, request_mode_, credentials_mode_,
       is_main_resource_load_, request_context_type_, frame_type_, body_);
   resource_context_ = resource_context;
 
   if (is_main_resource_load_)
     PrepareForMainResource(request);
   else
     PrepareForSubResource();
 
   if (job_->ShouldFallbackToNetwork()) {
     // If we know we can fallback to network at this point (in case
     // the storage lookup returned immediately), just return NULL here to
     // fallback to network.
     job_ = NULL;
+    // Once a subresource request was fallbacked to the network, we set
+    // |skip_service_worker_|  and the request shoud not go to the service
+    // worker.
+    if (!is_main_resource_load_)
+      skip_service_worker_ = true;

[falken, 2015/08/10 04:56:15]

Can you factor these out to a helper function so we don't have duplicated
code/comment.

[horo, 2015/08/10 05:43:41]

Done.

     return NULL;
   }
 
   return job_.get();
 }
 
 void ServiceWorkerControlleeRequestHandler::GetExtraResponseInfo(
     ResourceResponseInfo* response_info) const {
   if (!job_.get()) {
     response_info->was_fetched_via_service_worker = false;
@@ skipping 144 matching lines @@
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
   DCHECK(job_.get());
   DCHECK(context_);
   DCHECK(provider_host_->active_version());
   job_->ForwardToServiceWorker();
 }
 
 }  // namespace content