Pages controlled by ServiceWorkers should not participate in AppCaching

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"
@@ skipping 29 matching lines @@
     return handler->MaybeCreateJob(request, network_delegate);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRequestInterceptor);
 };
 
 // This is work around to avoid hijacking CORS preflight.
 // TODO(horo): Remove this check when we implement "HTTP fetch" correctly.
 // http://fetch.spec.whatwg.org/#concept-http-fetch
-bool IsMethodSupportedForServiceWroker(const std::string& method) {
+bool IsMethodSupportedForServiceWorker(const std::string& method) {
   return method != "OPTIONS";
 }
 
 }  // namespace
 
 void ServiceWorkerRequestHandler::InitializeHandler(
     net::URLRequest* request,
     ServiceWorkerContextWrapper* context_wrapper,
     storage::BlobStorageContext* blob_storage_context,
     int process_id,
     int provider_id,
     bool skip_service_worker,
     FetchRequestMode request_mode,
     FetchCredentialsMode credentials_mode,
     ResourceType resource_type,
     RequestContextType request_context_type,
     RequestContextFrameType frame_type,
     scoped_refptr<ResourceRequestBody> body) {
   if (!request->url().SchemeIsHTTPOrHTTPS() ||
-      !IsMethodSupportedForServiceWroker(request->method())) {
+      !IsMethodSupportedForServiceWorker(request->method())) {
     return;
   }
 
   if (!context_wrapper || !context_wrapper->context() ||
       provider_id == kInvalidServiceWorkerProviderId) {
     return;
   }
 
   ServiceWorkerProviderHost* provider_host =
       context_wrapper->context()->GetProviderHost(process_id, provider_id);
@@ skipping 27 matching lines @@
   return static_cast<ServiceWorkerRequestHandler*>(
       request->GetUserData(&kUserDataKey));
 }
 
 scoped_ptr<net::URLRequestInterceptor>
 ServiceWorkerRequestHandler::CreateInterceptor() {
   return scoped_ptr<net::URLRequestInterceptor>(
       new ServiceWorkerRequestInterceptor);
 }
 
+bool ServiceWorkerRequestHandler::IsControlledByServiceWorker(
+    net::URLRequest* request) {
+  ServiceWorkerRequestHandler* handler = GetHandler(request);
+  if (!handler || !handler->provider_host_)
+    return false;
+  return handler->provider_host_->associated_registration() ||
+         handler->provider_host_->running_hosted_version();
+}
+
 ServiceWorkerRequestHandler::~ServiceWorkerRequestHandler() {
 }
 
 ServiceWorkerRequestHandler::ServiceWorkerRequestHandler(
     base::WeakPtr<ServiceWorkerContextCore> context,
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
     ResourceType resource_type)
     : context_(context),
       provider_host_(provider_host),
       blob_storage_context_(blob_storage_context),
       resource_type_(resource_type) {
 }
 
 }  // namespace content