Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
index 7cecaa06c56bb0041edb6e5c4e82cb79e0b88453..49feae3d34b3c40147e63f52b74a391111822503 100644 |
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp |
@@ -315,10 +315,9 @@ void WebSharedWorkerImpl::OnScriptLoaderFinished() { |
return; |
} |
- Document* document = main_frame_->GetFrame()->GetDocument(); |
// FIXME: this document's origin is pristine and without any extra privileges. |
// (crbug.com/254993) |
- SecurityOrigin* starter_origin = document->GetSecurityOrigin(); |
+ SecurityOrigin* starter_origin = loading_document_->GetSecurityOrigin(); |
falken
2017/05/15 06:09:35
To be honest I don't understand this FIXME... what
kinuko
2017/05/15 07:26:55
This SecurityOrigin doesn't correctly reflect some
|
WorkerClients* worker_clients = WorkerClients::Create(); |
ProvideLocalFileSystemToWorker(worker_clients, |
@@ -347,9 +346,9 @@ void WebSharedWorkerImpl::OnScriptLoaderFinished() { |
ContentSecurityPolicy* content_security_policy = |
main_script_loader_->ReleaseContentSecurityPolicy(); |
WorkerThreadStartMode start_mode = |
- worker_inspector_proxy_->WorkerStartMode(document); |
- std::unique_ptr<WorkerSettings> worker_settings = |
- WTF::WrapUnique(new WorkerSettings(document->GetSettings())); |
+ worker_inspector_proxy_->WorkerStartMode(loading_document_); |
+ std::unique_ptr<WorkerSettings> worker_settings = WTF::WrapUnique( |
+ new WorkerSettings(main_frame_->GetFrame()->GetSettings())); |
WorkerV8Settings worker_v8_settings = WorkerV8Settings::Default(); |
worker_v8_settings.atomics_wait_mode_ = |
WorkerV8Settings::AtomicsWaitMode::kAllow; |