| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp
|
| index 094a61edfee695ae08a02638244007ec6ed8c9fc..2a5cabf96145b5a8d6c11de864d12abeb2bfe382 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp
|
| @@ -13,9 +13,9 @@
|
|
|
| namespace blink {
|
|
|
| -PassOwnPtrWillBeRawPtr<ServiceWorkerContainerClient> ServiceWorkerContainerClient::create(PassOwnPtr<WebServiceWorkerProvider> provider)
|
| +RawPtr<ServiceWorkerContainerClient> ServiceWorkerContainerClient::create(PassOwnPtr<WebServiceWorkerProvider> provider)
|
| {
|
| - return adoptPtrWillBeNoop(new ServiceWorkerContainerClient(provider));
|
| + return new ServiceWorkerContainerClient(provider);
|
| }
|
|
|
| ServiceWorkerContainerClient::ServiceWorkerContainerClient(PassOwnPtr<WebServiceWorkerProvider> provider)
|
| @@ -37,16 +37,16 @@ ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(ExecutionContex
|
| if (context->isWorkerGlobalScope()) {
|
| WorkerClients* clients = toWorkerGlobalScope(context)->clients();
|
| ASSERT(clients);
|
| - return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<WorkerClients>::from(clients, supplementName()));
|
| + return static_cast<ServiceWorkerContainerClient*>(HeapSupplement<WorkerClients>::from(clients, supplementName()));
|
| }
|
| Document* document = toDocument(context);
|
| if (!document->frame())
|
| return nullptr;
|
|
|
| - ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
|
| + ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContainerClient*>(HeapSupplement<Document>::from(document, supplementName()));
|
| if (!client) {
|
| client = new ServiceWorkerContainerClient(document->frame()->loader().client()->createServiceWorkerProvider());
|
| - WillBeHeapSupplement<Document>::provideTo(*document, supplementName(), adoptPtrWillBeNoop(client));
|
| + HeapSupplement<Document>::provideTo(*document, supplementName(), adoptPtrWillBeNoop(client));
|
| }
|
| return client;
|
| }
|
|
|