Index: Source/web/WebSharedWorkerImpl.cpp |
diff --git a/Source/web/WebSharedWorkerImpl.cpp b/Source/web/WebSharedWorkerImpl.cpp |
index affe4fa163d2c6f647c8867d567eaaf69f386f7f..ce91b9a68dfb6c3eeeb974e9c66884ab8d64aa5d 100644 |
--- a/Source/web/WebSharedWorkerImpl.cpp |
+++ b/Source/web/WebSharedWorkerImpl.cpp |
@@ -123,7 +123,7 @@ private: |
{ |
} |
- RefPtr<WorkerScriptLoader> m_scriptLoader; |
+ RefPtrWillBePersistent<WorkerScriptLoader> m_scriptLoader; |
unsigned long m_identifier; |
long long m_appCacheID; |
Closure m_receiveResponseCallback; |
@@ -306,7 +306,7 @@ void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) |
void WebSharedWorkerImpl::connectTask(ExecutionContext* context, PassOwnPtr<WebMessagePortChannel> channel) |
{ |
// Wrap the passed-in channel in a MessagePort, and send it off via a connect event. |
- RefPtr<MessagePort> port = MessagePort::create(*context); |
+ RefPtrWillBeRawPtr<MessagePort> port = MessagePort::create(*context); |
port->entangle(channel); |
WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); |
ASSERT_WITH_SECURITY_IMPLICATION(workerGlobalScope->isSharedWorkerGlobalScope()); |
@@ -350,7 +350,7 @@ 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()); |
+ OwnPtrWillBeRawPtr<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())); |
InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScriptLoader->identifier(), m_mainScriptLoader->script()); |
m_mainScriptLoader.clear(); |