Index: Source/web/ServiceWorkerGlobalScopeProxy.cpp |
diff --git a/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
index 8dc043e639b0f92687d319adbe5f27c5f11050bf..9cec6a477193b52efcd2ca1a48f14b36048f44ae 100644 |
--- a/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
+++ b/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
@@ -204,6 +204,13 @@ void ServiceWorkerGlobalScopeProxy::didEvaluateWorkerScript(bool success) |
m_client.didEvaluateWorkerScript(success); |
} |
+void ServiceWorkerGlobalScopeProxy::didInitializeWorkerContext() |
+{ |
+ ASSERT(m_workerGlobalScope); |
+ ScriptState::Scope scope(m_workerGlobalScope->script()->scriptState()); |
+ m_client.didInitializeWorkerContext(m_workerGlobalScope->script()->context(), WebURL(m_url)); |
+} |
+ |
void ServiceWorkerGlobalScopeProxy::workerGlobalScopeStarted(WorkerGlobalScope* workerGlobalScope) |
{ |
ASSERT(!m_workerGlobalScope); |
@@ -218,7 +225,7 @@ void ServiceWorkerGlobalScopeProxy::workerGlobalScopeClosed() |
void ServiceWorkerGlobalScopeProxy::willDestroyWorkerGlobalScope() |
{ |
- m_workerGlobalScope = nullptr; |
+ m_workerGlobalScope = 0; |
kinuko (google)
2015/08/17 10:27:20
It looks your patch's reverting newer changes, ple
annekao
2015/08/17 19:47:41
Done.
|
m_client.willDestroyWorkerContext(); |
} |
@@ -231,7 +238,8 @@ ServiceWorkerGlobalScopeProxy::ServiceWorkerGlobalScopeProxy(WebEmbeddedWorkerIm |
: m_embeddedWorker(embeddedWorker) |
, m_document(document) |
, m_client(client) |
- , m_workerGlobalScope(nullptr) |
+ , m_workerGlobalScope(0) |
+ , m_url(document.url().copy()) |
{ |
} |