|
|
|
@@ -268,7 +268,7 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/worker_module_s
|
|
|
|
|
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third_party/blink/renderer/core/workers/dedicated_worker.cc
|
|
|
|
|
--- a/third_party/blink/renderer/core/workers/dedicated_worker.cc
|
|
|
|
|
+++ b/third_party/blink/renderer/core/workers/dedicated_worker.cc
|
|
|
|
|
@@ -370,6 +370,7 @@ void DedicatedWorker::OnHostCreated(
|
|
|
|
|
@@ -371,6 +371,7 @@ void DedicatedWorker::OnHostCreated(
|
|
|
|
|
nullptr /* worker_main_script_load_params */,
|
|
|
|
|
network::mojom::ReferrerPolicy::kDefault,
|
|
|
|
|
Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
|
|
|
|
@@ -276,7 +276,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
String() /* source_code */, reject_coep_unsafe_none,
|
|
|
|
|
std::move(back_forward_cache_controller_host));
|
|
|
|
|
return;
|
|
|
|
|
@@ -427,6 +428,7 @@ void DedicatedWorker::OnScriptLoadStarted(
|
|
|
|
|
@@ -430,6 +431,7 @@ void DedicatedWorker::OnScriptLoadStarted(
|
|
|
|
|
ContinueStart(script_request_url_, std::move(worker_main_script_load_params),
|
|
|
|
|
network::mojom::ReferrerPolicy::kDefault,
|
|
|
|
|
Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
|
|
|
|
@@ -284,7 +284,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
String() /* source_code */, RejectCoepUnsafeNone(false),
|
|
|
|
|
std::move(back_forward_cache_controller_host));
|
|
|
|
|
}
|
|
|
|
|
@@ -499,6 +501,7 @@ void DedicatedWorker::OnFinished(
|
|
|
|
|
@@ -502,6 +504,7 @@ void DedicatedWorker::OnFinished(
|
|
|
|
|
? mojo::Clone(classic_script_loader_->GetContentSecurityPolicy()
|
|
|
|
|
->GetParsedPolicies())
|
|
|
|
|
: Vector<network::mojom::blink::ContentSecurityPolicyPtr>(),
|
|
|
|
@@ -292,7 +292,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
classic_script_loader_->SourceText(), RejectCoepUnsafeNone(false),
|
|
|
|
|
std::move(back_forward_cache_controller_host));
|
|
|
|
|
probe::ScriptImported(GetExecutionContext(),
|
|
|
|
|
@@ -515,6 +518,7 @@ void DedicatedWorker::ContinueStart(
|
|
|
|
|
@@ -518,6 +521,7 @@ void DedicatedWorker::ContinueStart(
|
|
|
|
|
network::mojom::ReferrerPolicy referrer_policy,
|
|
|
|
|
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
|
|
|
|
|
response_content_security_policies,
|
|
|
|
@@ -300,7 +300,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
const String& source_code,
|
|
|
|
|
RejectCoepUnsafeNone reject_coep_unsafe_none,
|
|
|
|
|
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
|
|
|
|
|
@@ -537,6 +541,7 @@ void DedicatedWorker::ContinueStart(
|
|
|
|
|
@@ -540,6 +544,7 @@ void DedicatedWorker::ContinueStart(
|
|
|
|
|
std::move(worker_main_script_load_params),
|
|
|
|
|
std::move(referrer_policy),
|
|
|
|
|
std::move(response_content_security_policies),
|
|
|
|
@@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
source_code, reject_coep_unsafe_none,
|
|
|
|
|
std::move(back_forward_cache_controller_host)),
|
|
|
|
|
base::Milliseconds(features::kDedicatedWorkerStartDelayInMs.Get()));
|
|
|
|
|
@@ -545,6 +550,7 @@ void DedicatedWorker::ContinueStart(
|
|
|
|
|
@@ -548,6 +553,7 @@ void DedicatedWorker::ContinueStart(
|
|
|
|
|
ContinueStartInternal(script_url, std::move(worker_main_script_load_params),
|
|
|
|
|
std::move(referrer_policy),
|
|
|
|
|
std::move(response_content_security_policies),
|
|
|
|
@@ -316,7 +316,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
source_code, reject_coep_unsafe_none,
|
|
|
|
|
std::move(back_forward_cache_controller_host));
|
|
|
|
|
}
|
|
|
|
|
@@ -556,6 +562,7 @@ void DedicatedWorker::ContinueStartInternal(
|
|
|
|
|
@@ -559,6 +565,7 @@ void DedicatedWorker::ContinueStartInternal(
|
|
|
|
|
network::mojom::ReferrerPolicy referrer_policy,
|
|
|
|
|
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
|
|
|
|
|
response_content_security_policies,
|
|
|
|
@@ -324,7 +324,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
const String& source_code,
|
|
|
|
|
RejectCoepUnsafeNone reject_coep_unsafe_none,
|
|
|
|
|
mojo::PendingRemote<mojom::blink::BackForwardCacheControllerHost>
|
|
|
|
|
@@ -567,7 +574,8 @@ void DedicatedWorker::ContinueStartInternal(
|
|
|
|
|
@@ -570,7 +577,8 @@ void DedicatedWorker::ContinueStartInternal(
|
|
|
|
|
context_proxy_->StartWorkerGlobalScope(
|
|
|
|
|
CreateGlobalScopeCreationParams(
|
|
|
|
|
script_url, referrer_policy,
|
|
|
|
@@ -334,7 +334,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
std::move(worker_main_script_load_params), options_, script_url,
|
|
|
|
|
*outside_fetch_client_settings_object_, v8_stack_trace_id_, source_code,
|
|
|
|
|
reject_coep_unsafe_none, token_,
|
|
|
|
|
@@ -604,7 +612,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
|
|
|
|
|
@@ -607,7 +615,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
|
|
|
|
|
const KURL& script_url,
|
|
|
|
|
network::mojom::ReferrerPolicy referrer_policy,
|
|
|
|
|
Vector<network::mojom::blink::ContentSecurityPolicyPtr>
|
|
|
|
@@ -344,7 +344,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third
|
|
|
|
|
base::UnguessableToken parent_devtools_token;
|
|
|
|
|
std::unique_ptr<WorkerSettings> settings;
|
|
|
|
|
ExecutionContext* execution_context = GetExecutionContext();
|
|
|
|
|
@@ -653,6 +662,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
|
|
|
|
|
@@ -656,6 +665,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams(
|
|
|
|
|
execution_context->GetSecurityOrigin(),
|
|
|
|
|
execution_context->IsSecureContext(), execution_context->GetHttpsState(),
|
|
|
|
|
MakeGarbageCollected<WorkerClients>(), CreateWebContentSettingsClient(),
|
|
|
|
|