| Index: Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| diff --git a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| index 9459305c759c2b7bce0042ea12f7d23828087bd4..8da82a34df5e22d152950d0e398e9d6c6d5200a4 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| +++ b/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp
|
| @@ -67,7 +67,7 @@ namespace blink {
|
| class ServiceWorkerGlobalScope::SkipWaitingCallback final : public WebServiceWorkerSkipWaitingCallbacks {
|
| WTF_MAKE_NONCOPYABLE(SkipWaitingCallback);
|
| public:
|
| - explicit SkipWaitingCallback(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
|
| + explicit SkipWaitingCallback(ScriptPromiseResolver* resolver)
|
| : m_resolver(resolver) { }
|
| ~SkipWaitingCallback() { }
|
|
|
| @@ -77,7 +77,7 @@ public:
|
| }
|
|
|
| private:
|
| - RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
|
| + Persistent<ScriptPromiseResolver> m_resolver;
|
| };
|
|
|
| PassRefPtrWillBeRawPtr<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::create(ServiceWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| @@ -154,7 +154,7 @@ ScriptPromise ServiceWorkerGlobalScope::skipWaiting(ScriptState* scriptState)
|
| if (!executionContext)
|
| return ScriptPromise();
|
|
|
| - RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
|
| + ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
|
| ScriptPromise promise = resolver->promise();
|
|
|
| ServiceWorkerGlobalScopeClient::from(executionContext)->skipWaiting(new SkipWaitingCallback(resolver));
|
|
|