Canonicalize creation of ServiceWorkerContainerClient supplement.

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

 // 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 "config.h"
 #include "ServiceWorkerContainerClient.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 
 namespace blink {
 
 PassOwnPtrWillBeRawPtr<ServiceWorkerContainerClient> ServiceWorkerContainerClient::create(PassOwnPtr<WebServiceWorkerProvider> provider)
 {
     return adoptPtrWillBeNoop(new ServiceWorkerContainerClient(provider));
 }
 
+ServiceWorkerContainerClient::ServiceWorkerContainerClient(PassOwnPtr<WebServiceWorkerProvider> provider)
+    : m_provider(provider)
+{
+}
+
 ServiceWorkerContainerClient::~ServiceWorkerContainerClient()
 {
 }
 
 const char* ServiceWorkerContainerClient::supplementName()
 {
     return "ServiceWorkerContainerClient";
 }
 
 ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(ExecutionContext* context)
 {
-    if (context->isDocument()) {
-        Document* document = toDocument(context);
-        if (!document->frame())
-            return 0;
+    if (context->isWorkerGlobalScope()) {
+        WorkerClients* clients = toWorkerGlobalScope(context)->clients();
+        ASSERT(clients);
+        return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<WorkerClients>::from(clients, supplementName()));
+    }
+    Document* document = toDocument(context);
+    if (!document->frame())
+        return nullptr;
 
-        ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
-        if (client)
-            return client;
-
-        // If it's not provided yet, create it lazily.
-        document->WillBeHeapSupplementable<Document>::provideSupplement(ServiceWorkerContainerClient::supplementName(), ServiceWorkerContainerClient::create(document->frame()->loader().client()->createServiceWorkerProvider()));
-        return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
+    ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
+    if (!client) {
+        client = new ServiceWorkerContainerClient(document->frame()->loader().client()->createServiceWorkerProvider());
+        WillBeHeapSupplement<Document>::provideTo(*document, supplementName(), adoptPtrWillBeNoop(client));
     }
-
-    WorkerClients* clients = toWorkerGlobalScope(context)->clients();
-    ASSERT(clients);
-    return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<WorkerClients>::from(clients, supplementName()));
-}
-
-ServiceWorkerContainerClient::ServiceWorkerContainerClient(PassOwnPtr<WebServiceWorkerProvider> provider)
-    : m_provider(provider)
-{
+    return client;
 }
 
 void provideServiceWorkerContainerClientToWorker(WorkerClients* clients, PassOwnPtr<WebServiceWorkerProvider> provider)
 {
     clients->provideSupplement(ServiceWorkerContainerClient::supplementName(), ServiceWorkerContainerClient::create(provider));
 }
 
 } // namespace blink