Chromium Code Reviews| Index: third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp |
| diff --git a/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp b/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp |
| index ac3dd3c284ac78d8dbc12238e9bb2a91083e170c..c99d4ed3f4a69a4272e4a40af7e92a672a47fd6d 100644 |
| --- a/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp |
| +++ b/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp |
| @@ -31,6 +31,7 @@ |
| #include "bindings/core/v8/V8GCController.h" |
| #include "core/dom/CrossThreadTask.h" |
| #include "core/dom/Document.h" |
| +#include "core/dom/SecurityContext.h" |
| #include "core/events/ErrorEvent.h" |
| #include "core/events/MessageEvent.h" |
| #include "core/frame/Console.h" |
| @@ -112,7 +113,7 @@ void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S |
| ContentSecurityPolicy* csp = m_workerObject->contentSecurityPolicy() ? m_workerObject->contentSecurityPolicy() : document->contentSecurityPolicy(); |
| ASSERT(csp); |
| - OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(scriptURL, userAgent, sourceCode, nullptr, startMode, csp->headers(), starterOrigin, m_workerClients.release()); |
| + OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(scriptURL, userAgent, sourceCode, nullptr, startMode, csp->headers(), starterOrigin, m_workerClients.release(), document->addressSpace()); |
|
Mike West
2016/03/03 05:24:26
This `document` is the actual document spinning up
kinuko
2016/03/03 08:15:49
Yes, this one is the right parent one.
|
| double originTime = document->loader() ? document->loader()->timing().referenceMonotonicTime() : monotonicallyIncreasingTime(); |
| m_loaderProxy = WorkerLoaderProxy::create(this); |