| Index: Source/core/workers/SharedWorkerGlobalScope.cpp
|
| diff --git a/Source/core/workers/SharedWorkerGlobalScope.cpp b/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| index c961699b9226d743ab3aa06668bffb0de68fcc68..85d25f85d524118883eb51fa17c9c91c4cbcc5dc 100644
|
| --- a/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| +++ b/Source/core/workers/SharedWorkerGlobalScope.cpp
|
| @@ -53,13 +53,13 @@ PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort> prpPort)
|
| // static
|
| PassRefPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| {
|
| - RefPtr<SharedWorkerGlobalScope> context = adoptRef(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData->m_workerClients.release()));
|
| + RefPtr<SharedWorkerGlobalScope> context = adoptRef(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData->m_workerClients.release(), startupData->m_workerSettings.release()));
|
| context->applyContentSecurityPolicyFromString(startupData->m_contentSecurityPolicy, startupData->m_contentSecurityPolicyType);
|
| return context.release();
|
| }
|
|
|
| -SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtr<WorkerClients> workerClients)
|
| - : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), workerClients)
|
| +SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtr<WorkerClients> workerClients, PassOwnPtr<WorkerSettings> settings)
|
| + : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), workerClients, settings)
|
| , m_name(name)
|
| {
|
| ScriptWrappable::init(this);
|
|
|