Index: Source/core/workers/WorkerMessagingProxy.cpp |
diff --git a/Source/core/workers/WorkerMessagingProxy.cpp b/Source/core/workers/WorkerMessagingProxy.cpp |
index aef742dc48bceaef9d5efec621b478b2daecc96a..e560a89a753da50d5ce2bf4ecf41ce798c36194e 100644 |
--- a/Source/core/workers/WorkerMessagingProxy.cpp |
+++ b/Source/core/workers/WorkerMessagingProxy.cpp |
@@ -117,7 +117,11 @@ void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S |
} |
Document* document = toDocument(m_executionContext.get()); |
- OwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(scriptURL, userAgent, sourceCode, startMode, document->contentSecurityPolicy()->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedHeaderType(), m_workerClients.release()); |
+ SecurityOrigin::PolicyOverrides originPolicyOverrides; |
+ if (document->securityOrigin()) |
Mike West
2014/09/26 11:29:10
When do we ever have Documents without SecurityOri
|
+ originPolicyOverrides = document->securityOrigin()->policyOverrides(); |
+ |
+ OwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(scriptURL, userAgent, sourceCode, startMode, document->contentSecurityPolicy()->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedHeaderType(), originPolicyOverrides, m_workerClients.release()); |
double originTime = document->loader() ? document->loader()->timing()->referenceMonotonicTime() : monotonicallyIncreasingTime(); |
RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(*this, *m_workerObjectProxy.get(), originTime, startupData.release()); |