| Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| index a673ecfb72d62a8465dc947e4c6b593a4c786fcc..c2383a70bdd6758ffb780950bf2d3443364c7524 100644
|
| --- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| +++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| @@ -230,8 +230,8 @@ void ServiceWorkerGlobalScopeProxy::didEvaluateWorkerScript(bool success)
|
|
|
| void ServiceWorkerGlobalScopeProxy::didInitializeWorkerContext()
|
| {
|
| - ScriptState::Scope scope(workerGlobalScope()->script()->scriptState());
|
| - client().didInitializeWorkerContext(workerGlobalScope()->script()->context(), WebURL(m_documentURL));
|
| + ScriptState::Scope scope(workerGlobalScope()->scriptController()->scriptState());
|
| + client().didInitializeWorkerContext(workerGlobalScope()->scriptController()->context(), WebURL(m_documentURL));
|
| }
|
|
|
| void ServiceWorkerGlobalScopeProxy::workerGlobalScopeStarted(WorkerGlobalScope* workerGlobalScope)
|
| @@ -250,7 +250,7 @@ void ServiceWorkerGlobalScopeProxy::workerGlobalScopeClosed()
|
| void ServiceWorkerGlobalScopeProxy::willDestroyWorkerGlobalScope()
|
| {
|
| v8::HandleScope handleScope(workerGlobalScope()->thread()->isolate());
|
| - client().willDestroyWorkerContext(workerGlobalScope()->script()->context());
|
| + client().willDestroyWorkerContext(workerGlobalScope()->scriptController()->context());
|
| m_workerGlobalScope = nullptr;
|
| }
|
|
|
|
|