Chromium Code Reviews| Index: Source/web/WebSharedWorkerImpl.cpp |
| diff --git a/Source/web/WebSharedWorkerImpl.cpp b/Source/web/WebSharedWorkerImpl.cpp |
| index affe4fa163d2c6f647c8867d567eaaf69f386f7f..09a2f7cdb597059b79624afd06cdaf3076e8425e 100644 |
| --- a/Source/web/WebSharedWorkerImpl.cpp |
| +++ b/Source/web/WebSharedWorkerImpl.cpp |
| @@ -156,6 +156,7 @@ WebSharedWorkerImpl::WebSharedWorkerImpl(WebSharedWorkerClient* client) |
| , m_clientWeakPtr(WeakPtr<WebSharedWorkerClient>(m_client)) |
| , m_pauseWorkerContextOnStart(false) |
| , m_attachDevToolsOnStart(false) |
| + , m_settings(adoptPtr(new WebWorkerSettingsImpl())) |
| { |
| initializeWebKitStaticValues(); |
| } |
| @@ -350,7 +351,10 @@ void WebSharedWorkerImpl::onScriptLoaderFinished() |
| provideDatabaseClientToWorker(workerClients.get(), DatabaseClientImpl::create()); |
| 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()); |
| + OwnPtr<WorkerSettings> settings = WorkerSettings::create(); |
| + settings->setMemoryInfoEnabled(m_settings->memoryInfoEnabled()); |
|
kinuko
2014/03/04 04:34:35
As I commented in the other file I prefer having t
Pan
2014/03/06 08:50:56
thanks! done
|
| + 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(), settings.release()); |
| + |
| setWorkerThread(SharedWorkerThread::create(m_name, *this, *this, startupData.release())); |
| InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScriptLoader->identifier(), m_mainScriptLoader->script()); |
| m_mainScriptLoader.clear(); |