Index: Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp |
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp b/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp |
index 285a9dd1d0a6c7aa0bf989e4141ef718cd81eaf3..e7ec90518170e2af030a524b9b323c89a30e2d22 100644 |
--- a/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp |
+++ b/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp |
@@ -14,9 +14,9 @@ |
namespace WebCore { |
-PassOwnPtr<ServiceWorkerContainerClient> ServiceWorkerContainerClient::create(PassOwnPtr<blink::WebServiceWorkerProvider> provider) |
+PassOwnPtrWillBeRawPtr<ServiceWorkerContainerClient> ServiceWorkerContainerClient::create(PassOwnPtr<blink::WebServiceWorkerProvider> provider) |
{ |
- return adoptPtr(new ServiceWorkerContainerClient(provider)); |
+ return adoptPtrWillBeNoop(new ServiceWorkerContainerClient(provider)); |
} |
ServiceWorkerContainerClient::~ServiceWorkerContainerClient() |
@@ -40,12 +40,12 @@ ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(ExecutionContex |
return client; |
// If it's not provided yet, create it lazily. |
- document->Supplementable<Document>::provideSupplement(ServiceWorkerContainerClient::supplementName(), ServiceWorkerContainerClient::create(document->frame()->loader().client()->createServiceWorkerProvider())); |
+ document->DocumentSupplementable::provideSupplement(ServiceWorkerContainerClient::supplementName(), ServiceWorkerContainerClient::create(document->frame()->loader().client()->createServiceWorkerProvider())); |
return static_cast<ServiceWorkerContainerClient*>(DocumentSupplement::from(document, supplementName())); |
} |
ASSERT(context->isWorkerGlobalScope()); |
- return static_cast<ServiceWorkerContainerClient*>(Supplement<WorkerClients>::from(toWorkerGlobalScope(context)->clients(), supplementName())); |
+ return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<WorkerClients>::from(toWorkerGlobalScope(context)->clients(), supplementName())); |
} |
ServiceWorkerContainerClient::ServiceWorkerContainerClient(PassOwnPtr<blink::WebServiceWorkerProvider> provider) |