Implement updateViaCache flag and no-cache by default for main service worker scripts

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
 #include "platform/weborigin/SecurityViolationReportingPolicy.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/modules/serviceworker/WebServiceWorker.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
 
 namespace blink {
 
+namespace {
+
+WebServiceWorkerUpdateViaCache ParseUpdateViaCache(const String& value) {

[nhiroki, 2017/08/04 09:24:50]

Can you sync this implementation with ParseUpdateViaCache() in
HTMLLinkElement.cpp?

[yuryu, 2017/08/17 07:36:35]

Done.

+  if (value == "all")
+    return WebServiceWorkerUpdateViaCache::kAll;
+  if (value == "none")
+    return WebServiceWorkerUpdateViaCache::kNone;
+  return WebServiceWorkerUpdateViaCache::kImports;
+}
+
+}  // namespace
+
 class GetRegistrationCallback : public WebServiceWorkerProvider::
                                     WebServiceWorkerGetRegistrationCallbacks {
  public:
   explicit GetRegistrationCallback(ScriptPromiseResolver* resolver)
       : resolver_(resolver) {}
   ~GetRegistrationCallback() override {}
 
   void OnSuccess(std::unique_ptr<WebServiceWorkerRegistration::Handle>
                      web_pass_handle) override {
     std::unique_ptr<WebServiceWorkerRegistration::Handle> handle =
@@ skipping 70 matching lines @@
   visitor->Trace(ready_);
   visitor->Trace(navigator_);
   EventTargetWithInlineData::Trace(visitor);
   ContextLifecycleObserver::Trace(visitor);
 }
 
 void ServiceWorkerContainer::RegisterServiceWorkerImpl(
     ExecutionContext* execution_context,
     const KURL& raw_script_url,
     const KURL& scope,
+    WebServiceWorkerUpdateViaCache update_via_cache,
     std::unique_ptr<RegistrationCallbacks> callbacks) {
   if (!provider_) {
     callbacks->OnError(
         WebServiceWorkerError(WebServiceWorkerError::kErrorTypeState,
                               "Failed to register a ServiceWorker: The "
                               "document is in an invalid state."));
     return;
   }
 
   RefPtr<SecurityOrigin> document_origin =
@@ skipping 85 matching lines @@
       callbacks->OnError(WebServiceWorkerError(
           WebServiceWorkerError::kErrorTypeSecurity,
           String(
               "Failed to register a ServiceWorker: The provided scriptURL ('" +
               script_url.GetString() +
               "') violates the Content Security Policy.")));
       return;
     }
   }
 
-  provider_->RegisterServiceWorker(pattern_url, script_url,
+  provider_->RegisterServiceWorker(pattern_url, script_url, update_via_cache,
                                    std::move(callbacks));
 }
 
 ScriptPromise ServiceWorkerContainer::registerServiceWorker(
     ScriptState* script_state,
     const String& url,
     const RegistrationOptions& options) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
@@ skipping 12 matching lines @@
 
   KURL script_url = execution_context->CompleteURL(url);
   script_url.RemoveFragmentIdentifier();
 
   KURL pattern_url;
   if (options.scope().IsNull())
     pattern_url = KURL(script_url, "./");
   else
     pattern_url = execution_context->CompleteURL(options.scope());
 
+  WebServiceWorkerUpdateViaCache update_via_cache =
+      ParseUpdateViaCache(options.updateViaCache());
+
   RegisterServiceWorkerImpl(
-      execution_context, script_url, pattern_url,
+      execution_context, script_url, pattern_url, update_via_cache,
       WTF::MakeUnique<CallbackPromiseAdapter<ServiceWorkerRegistration,
                                              ServiceWorkerErrorForUpdate>>(
           resolver));
 
   return promise;
 }
 
 ScriptPromise ServiceWorkerContainer::getRegistration(
     ScriptState* script_state,
     const String& document_url) {
@@ skipping 178 matching lines @@
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::From(execution_context)) {
     provider_ = client->Provider();
     if (provider_)
       provider_->SetClient(this);
   }
 }
 
 }  // namespace blink