| Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| index 6572f6da70cf6fe65b34628bb887eeeba2989cec..15823846e02b687f938e3bb721d7e0a65c9db584 100644
|
| --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| @@ -15,6 +15,8 @@
|
| #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
|
| #include "modules/serviceworkers/ServiceWorkerError.h"
|
| #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -32,24 +34,24 @@ void ServiceWorkerRegistration::setInstalling(std::unique_ptr<WebServiceWorker::
|
| {
|
| if (!getExecutionContext())
|
| return;
|
| - m_installing = ServiceWorker::from(getExecutionContext(), adoptPtr(handle.release()));
|
| + m_installing = ServiceWorker::from(getExecutionContext(), wrapUnique(handle.release()));
|
| }
|
|
|
| void ServiceWorkerRegistration::setWaiting(std::unique_ptr<WebServiceWorker::Handle> handle)
|
| {
|
| if (!getExecutionContext())
|
| return;
|
| - m_waiting = ServiceWorker::from(getExecutionContext(), adoptPtr(handle.release()));
|
| + m_waiting = ServiceWorker::from(getExecutionContext(), wrapUnique(handle.release()));
|
| }
|
|
|
| void ServiceWorkerRegistration::setActive(std::unique_ptr<WebServiceWorker::Handle> handle)
|
| {
|
| if (!getExecutionContext())
|
| return;
|
| - m_active = ServiceWorker::from(getExecutionContext(), adoptPtr(handle.release()));
|
| + m_active = ServiceWorker::from(getExecutionContext(), wrapUnique(handle.release()));
|
| }
|
|
|
| -ServiceWorkerRegistration* ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration::Handle> handle)
|
| +ServiceWorkerRegistration* ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, std::unique_ptr<WebServiceWorkerRegistration::Handle> handle)
|
| {
|
| ASSERT(handle);
|
|
|
| @@ -93,7 +95,7 @@ ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
|
| return promise;
|
| }
|
|
|
| -ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration::Handle> handle)
|
| +ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* executionContext, std::unique_ptr<WebServiceWorkerRegistration::Handle> handle)
|
| : ActiveScriptWrappable(this)
|
| , ActiveDOMObject(executionContext)
|
| , m_handle(std::move(handle))
|
|
|