| Index: Source/modules/serviceworkers/ServiceWorker.cpp
|
| diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/modules/serviceworkers/ServiceWorker.cpp
|
| index 686bda0f9ab6e9330c62a375e6424cfef5447327..5c4afb4342b5bf8c8813287eec98f6e63ccae863 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorker.cpp
|
| +++ b/Source/modules/serviceworkers/ServiceWorker.cpp
|
| @@ -137,21 +137,21 @@ const AtomicString& ServiceWorker::state() const
|
| }
|
| }
|
|
|
| -PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptState* scriptState, WebType* worker)
|
| +PassRefPtr<ServiceWorker> ServiceWorker::from(ExecutionContext* executionContext, WebType* worker)
|
| {
|
| blink::WebServiceWorkerProxy* proxy = worker->proxy();
|
| ServiceWorker* existingServiceWorker = proxy ? proxy->unwrap() : 0;
|
| if (existingServiceWorker) {
|
| - ASSERT(existingServiceWorker->executionContext() == scriptState->executionContext());
|
| + ASSERT(existingServiceWorker->executionContext() == executionContext);
|
| return existingServiceWorker;
|
| }
|
|
|
| - return create(scriptState->executionContext(), adoptPtr(worker));
|
| + return create(executionContext, adoptPtr(worker));
|
| }
|
|
|
| PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolverWithContext* resolver, WebType* worker)
|
| {
|
| - RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptState(), worker);
|
| + RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptState()->executionContext(), worker);
|
|
|
| ScriptState::Scope scope(resolver->scriptState());
|
| serviceWorker->waitOnPromise(resolver->promise());
|
|
|