Worker: Remove AddressSpace param from WorkerClassicScriptLoader
WorkerClassicScriptLoader takes fetch client's ResourceFetcher that provides
fetch client's AddressSpace, so it doesn't have to take AddressSpace as a param.
Bug: 878274, 945215
Change-Id: I3ca0ccc7834522fc627f7af746fc6d632629d7eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1578145
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653394}diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
index 339c638..7f337ba9 100644
--- a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
@@ -152,7 +152,6 @@
script_request_url_, mojom::RequestContextType::SHARED_WORKER,
network::mojom::FetchRequestMode::kSameOrigin,
network::mojom::FetchCredentialsMode::kSameOrigin,
- creation_address_space_,
Bind(&WebSharedWorkerImpl::DidReceiveScriptLoaderResponse,
WTF::Unretained(this)),
Bind(&WebSharedWorkerImpl::OnScriptLoaderFinished,
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third_party/blink/renderer/core/workers/dedicated_worker.cc
index 60259c5..5990ae3 100644
--- a/third_party/blink/renderer/core/workers/dedicated_worker.cc
+++ b/third_party/blink/renderer/core/workers/dedicated_worker.cc
@@ -246,7 +246,6 @@
script_request_url_, mojom::RequestContextType::WORKER,
network::mojom::FetchRequestMode::kSameOrigin,
network::mojom::FetchCredentialsMode::kSameOrigin,
- GetExecutionContext()->GetSecurityContext().AddressSpace(),
WTF::Bind(&DedicatedWorker::OnResponse, WrapPersistent(this)),
WTF::Bind(&DedicatedWorker::OnFinished, WrapPersistent(this)));
return;
diff --git a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc
index 0d8dc7a..46a6ce4 100644
--- a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc
@@ -92,7 +92,6 @@
*this, CreateOutsideSettingsFetcher(outside_settings_object), script_url,
destination, network::mojom::FetchRequestMode::kSameOrigin,
network::mojom::FetchCredentialsMode::kSameOrigin,
- outside_settings_object.GetAddressSpace(),
WTF::Bind(&DedicatedWorkerGlobalScope::DidReceiveResponseForClassicScript,
WrapWeakPersistent(this),
WrapPersistent(classic_script_loader)),
diff --git a/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc b/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc
index eea7b44f..6440d36 100644
--- a/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/shared_worker_global_scope.cc
@@ -83,7 +83,6 @@
*this, CreateOutsideSettingsFetcher(outside_settings_object), script_url,
destination, network::mojom::FetchRequestMode::kSameOrigin,
network::mojom::FetchCredentialsMode::kSameOrigin,
- outside_settings_object.GetAddressSpace(),
WTF::Bind(&SharedWorkerGlobalScope::DidReceiveResponseForClassicScript,
WrapWeakPersistent(this),
WrapPersistent(classic_script_loader)),
diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
index e2134f5..d90b74ba 100644
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
@@ -102,8 +102,7 @@
ExecutionContext& execution_context,
ResourceFetcher* fetch_client_settings_object_fetcher,
const KURL& url,
- mojom::RequestContextType request_context,
- mojom::IPAddressSpace creation_address_space) {
+ mojom::RequestContextType request_context) {
DCHECK(fetch_client_settings_object_fetcher);
url_ = url;
fetch_client_settings_object_fetcher_ = fetch_client_settings_object_fetcher;
@@ -111,7 +110,9 @@
ResourceRequest request(url);
request.SetHttpMethod(http_names::kGET);
request.SetExternalRequestStateFromRequestorAddressSpace(
- creation_address_space);
+ fetch_client_settings_object_fetcher_->GetProperties()
+ .GetFetchClientSettingsObject()
+ .GetAddressSpace());
request.SetRequestContext(request_context);
SECURITY_DCHECK(execution_context.IsWorkerGlobalScope());
@@ -134,7 +135,6 @@
mojom::RequestContextType request_context,
network::mojom::FetchRequestMode fetch_request_mode,
network::mojom::FetchCredentialsMode fetch_credentials_mode,
- mojom::IPAddressSpace creation_address_space,
base::OnceClosure response_callback,
base::OnceClosure finished_callback) {
DCHECK(fetch_client_settings_object_fetcher);
@@ -150,7 +150,9 @@
ResourceRequest request(url);
request.SetHttpMethod(http_names::kGET);
request.SetExternalRequestStateFromRequestorAddressSpace(
- creation_address_space);
+ fetch_client_settings_object_fetcher_->GetProperties()
+ .GetFetchClientSettingsObject()
+ .GetAddressSpace());
request.SetRequestContext(request_context);
request.SetFetchRequestMode(fetch_request_mode);
request.SetFetchCredentialsMode(fetch_credentials_mode);
diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.h b/third_party/blink/renderer/core/workers/worker_classic_script_loader.h
index 352c44e..f4f13bd 100644
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.h
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.h
@@ -64,8 +64,7 @@
void LoadSynchronously(ExecutionContext&,
ResourceFetcher* fetch_client_settings_object_fetcher,
const KURL&,
- mojom::RequestContextType,
- mojom::IPAddressSpace);
+ mojom::RequestContextType);
// Note that callbacks could be invoked before
// LoadTopLevelScriptAsynchronously() returns.
@@ -79,7 +78,6 @@
mojom::RequestContextType,
network::mojom::FetchRequestMode,
network::mojom::FetchCredentialsMode,
- mojom::IPAddressSpace,
base::OnceClosure response_callback,
base::OnceClosure finished_callback);
diff --git a/third_party/blink/renderer/core/workers/worker_global_scope.cc b/third_party/blink/renderer/core/workers/worker_global_scope.cc
index 2281433..2ab81ed 100644
--- a/third_party/blink/renderer/core/workers/worker_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/worker_global_scope.cc
@@ -305,11 +305,7 @@
EnsureFetcher();
classic_script_loader->LoadSynchronously(*execution_context, Fetcher(),
script_url,
- mojom::RequestContextType::SCRIPT,
- Fetcher()
- ->GetProperties()
- .GetFetchClientSettingsObject()
- .GetAddressSpace());
+ mojom::RequestContextType::SCRIPT);
if (classic_script_loader->Failed())
return false;
*out_response_url = classic_script_loader->ResponseURL();
diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
index 230770de..13a259bb5 100644
--- a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
+++ b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
@@ -323,8 +323,7 @@
*shadow_page_->GetDocument(), shadow_page_->GetDocument()->Fetcher(),
worker_start_data_.script_url, mojom::RequestContextType::SERVICE_WORKER,
network::mojom::FetchRequestMode::kSameOrigin,
- network::mojom::FetchCredentialsMode::kSameOrigin,
- worker_start_data_.address_space, base::OnceClosure(),
+ network::mojom::FetchCredentialsMode::kSameOrigin, base::OnceClosure(),
Bind(&WebEmbeddedWorkerImpl::OnScriptLoaderFinished,
WTF::Unretained(this)));
// Do nothing here since OnScriptLoaderFinished() might have been already
diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
index de76cc8..e4e4a02 100644
--- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
+++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
@@ -181,7 +181,6 @@
*this, CreateOutsideSettingsFetcher(outside_settings_object), script_url,
destination, network::mojom::FetchRequestMode::kSameOrigin,
network::mojom::FetchCredentialsMode::kSameOrigin,
- outside_settings_object.GetAddressSpace(),
WTF::Bind(&ServiceWorkerGlobalScope::DidReceiveResponseForClassicScript,
WrapWeakPersistent(this),
WrapPersistent(classic_script_loader)),
