| Index: Source/web/WebSharedWorkerImpl.cpp
|
| diff --git a/Source/web/WebSharedWorkerImpl.cpp b/Source/web/WebSharedWorkerImpl.cpp
|
| index affe4fa163d2c6f647c8867d567eaaf69f386f7f..6e8d31631aabd075a074d6ca1e93c9dc69d5531d 100644
|
| --- a/Source/web/WebSharedWorkerImpl.cpp
|
| +++ b/Source/web/WebSharedWorkerImpl.cpp
|
| @@ -351,7 +351,10 @@ void WebSharedWorkerImpl::onScriptLoaderFinished()
|
| WebSecurityOrigin webSecurityOrigin(m_loadingDocument->securityOrigin());
|
| providePermissionClientToWorker(workerClients.get(), adoptPtr(client()->createWorkerPermissionClientProxy(webSecurityOrigin)));
|
| OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(m_url, m_loadingDocument->userAgent(m_url), m_mainScriptLoader->script(), startMode, m_contentSecurityPolicy, static_cast<WebCore::ContentSecurityPolicy::HeaderType>(m_policyType), workerClients.release());
|
| - setWorkerThread(SharedWorkerThread::create(m_name, *this, *this, startupData.release()));
|
| + OwnPtr<WorkerSettings> settings = WorkerSettings::create();
|
| + if (client())
|
| + settings->setMemoryInfoEnabled(client()->enableMemoryInfo());
|
| + setWorkerThread(SharedWorkerThread::create(m_name, *this, *this, settings.release(), startupData.release()));
|
| InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScriptLoader->identifier(), m_mainScriptLoader->script());
|
| m_mainScriptLoader.clear();
|
|
|
|
|