Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

Issue 900793002: ServiceWorker: Support SWRegistration.unregister() in SWGlobalScope [2/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: return nullptr instead of 0 Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "ServiceWorkerContainerClient.h" 6 #include "ServiceWorkerContainerClient.h"
7 7
8 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
9 #include "core/dom/ExecutionContext.h" 9 #include "core/dom/ExecutionContext.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 26 matching lines...) Expand all
37 37
38 ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContaine rClient*>(DocumentSupplement::from(document, supplementName())); 38 ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContaine rClient*>(DocumentSupplement::from(document, supplementName()));
39 if (client) 39 if (client)
40 return client; 40 return client;
41 41
42 // If it's not provided yet, create it lazily. 42 // If it's not provided yet, create it lazily.
43 document->DocumentSupplementable::provideSupplement(ServiceWorkerContain erClient::supplementName(), ServiceWorkerContainerClient::create(document->frame ()->loader().client()->createServiceWorkerProvider())); 43 document->DocumentSupplementable::provideSupplement(ServiceWorkerContain erClient::supplementName(), ServiceWorkerContainerClient::create(document->frame ()->loader().client()->createServiceWorkerProvider()));
44 return static_cast<ServiceWorkerContainerClient*>(DocumentSupplement::fr om(document, supplementName())); 44 return static_cast<ServiceWorkerContainerClient*>(DocumentSupplement::fr om(document, supplementName()));
45 } 45 }
46 46
47 if (context->isServiceWorkerGlobalScope()) {
48 ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContaine rClient*>(WillBeHeapSupplement<WorkerClients>::from(toWorkerGlobalScope(context) ->clients(), supplementName()));
49 ASSERT(client);
50 return client;
51 }
52
47 ASSERT(context->isWorkerGlobalScope()); 53 ASSERT(context->isWorkerGlobalScope());
48 return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<Worke rClients>::from(toWorkerGlobalScope(context)->clients(), supplementName())); 54 return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<Worke rClients>::from(toWorkerGlobalScope(context)->clients(), supplementName()));
49 } 55 }
50 56
51 ServiceWorkerContainerClient::ServiceWorkerContainerClient(PassOwnPtr<WebService WorkerProvider> provider) 57 ServiceWorkerContainerClient::ServiceWorkerContainerClient(PassOwnPtr<WebService WorkerProvider> provider)
52 : m_provider(provider) 58 : m_provider(provider)
53 { 59 {
54 } 60 }
55 61
56 void provideServiceWorkerContainerClientToWorker(WorkerClients* clients, PassOwn Ptr<WebServiceWorkerProvider> provider) 62 void provideServiceWorkerContainerClientToWorker(WorkerClients* clients, PassOwn Ptr<WebServiceWorkerProvider> provider)
57 { 63 {
58 clients->provideSupplement(ServiceWorkerContainerClient::supplementName(), S erviceWorkerContainerClient::create(provider)); 64 clients->provideSupplement(ServiceWorkerContainerClient::supplementName(), S erviceWorkerContainerClient::create(provider));
59 } 65 }
60 66
61 } // namespace blink 67 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698