Commit 579d02ad authored by Hiroki Nakagawa's avatar Hiroki Nakagawa Committed by Commit Bot

Worker: Rename ServiceWorkerSubresourceLoaderUpdater to SubresourceLoaderUpdater

This CL renames ServiceWorkerSubresourceLoaderUpdater interface to
SubresourceLoaderUpdater because the interface is now also used for dedicated
workers. Along with that, this moves the interface from service_worker/ to
worker/.

Bug: 945101
Change-Id: Ic56d5b372452981b6649b119f3406e168f7f4711
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786365
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695032}
parent a41f9d51
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "third_party/blink/public/mojom/service_worker/embedded_worker.mojom.h" #include "third_party/blink/public/mojom/service_worker/embedded_worker.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_installed_scripts_manager.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_installed_scripts_manager.mojom.h"
#include "third_party/blink/public/mojom/worker/subresource_loader_updater.mojom.h"
#include "url/gurl.h" #include "url/gurl.h"
namespace content { namespace content {
...@@ -370,7 +371,7 @@ class CONTENT_EXPORT EmbeddedWorkerInstance ...@@ -370,7 +371,7 @@ class CONTENT_EXPORT EmbeddedWorkerInstance
// Remote interface to talk to a running service worker. Used to update // Remote interface to talk to a running service worker. Used to update
// subresource loader factories in the service worker. // subresource loader factories in the service worker.
mojo::Remote<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::Remote<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater_; subresource_loader_updater_;
base::WeakPtrFactory<EmbeddedWorkerInstance> weak_factory_{this}; base::WeakPtrFactory<EmbeddedWorkerInstance> weak_factory_{this};
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
#include "services/service_manager/public/mojom/interface_provider.mojom.h" #include "services/service_manager/public/mojom/interface_provider.mojom.h"
#include "third_party/blink/public/mojom/filesystem/file_system.mojom-forward.h" #include "third_party/blink/public/mojom/filesystem/file_system.mojom-forward.h"
#include "third_party/blink/public/mojom/idle/idle_manager.mojom-forward.h" #include "third_party/blink/public/mojom/idle/idle_manager.mojom-forward.h"
#include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h"
#include "third_party/blink/public/mojom/usb/web_usb_service.mojom-forward.h" #include "third_party/blink/public/mojom/usb/web_usb_service.mojom-forward.h"
#include "third_party/blink/public/mojom/websockets/websocket_connector.mojom-forward.h" #include "third_party/blink/public/mojom/websockets/websocket_connector.mojom-forward.h"
#include "third_party/blink/public/mojom/worker/dedicated_worker_host.mojom.h" #include "third_party/blink/public/mojom/worker/dedicated_worker_host.mojom.h"
#include "third_party/blink/public/mojom/worker/dedicated_worker_host_factory.mojom.h" #include "third_party/blink/public/mojom/worker/dedicated_worker_host_factory.mojom.h"
#include "third_party/blink/public/mojom/worker/subresource_loader_updater.mojom.h"
namespace url { namespace url {
class Origin; class Origin;
...@@ -185,7 +185,7 @@ class DedicatedWorkerHost final ...@@ -185,7 +185,7 @@ class DedicatedWorkerHost final
// For observing Network Service connection errors only. // For observing Network Service connection errors only.
network::mojom::URLLoaderFactoryPtr network::mojom::URLLoaderFactoryPtr
network_service_connection_error_handler_holder_; network_service_connection_error_handler_holder_;
mojo::Remote<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::Remote<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater_; subresource_loader_updater_;
base::WeakPtrFactory<DedicatedWorkerHost> weak_factory_{this}; base::WeakPtrFactory<DedicatedWorkerHost> weak_factory_{this};
......
...@@ -154,7 +154,7 @@ scoped_refptr<WebWorkerFetchContextImpl> WebWorkerFetchContextImpl::Create( ...@@ -154,7 +154,7 @@ scoped_refptr<WebWorkerFetchContextImpl> WebWorkerFetchContextImpl::Create(
watcher_receiver, watcher_receiver,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater) { pending_subresource_loader_updater) {
mojo::PendingReceiver<blink::mojom::ServiceWorkerWorkerClient> mojo::PendingReceiver<blink::mojom::ServiceWorkerWorkerClient>
service_worker_client_receiver; service_worker_client_receiver;
...@@ -216,7 +216,7 @@ WebWorkerFetchContextImpl::WebWorkerFetchContextImpl( ...@@ -216,7 +216,7 @@ WebWorkerFetchContextImpl::WebWorkerFetchContextImpl(
service_worker_container_host, service_worker_container_host,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater, pending_subresource_loader_updater,
std::unique_ptr<URLLoaderThrottleProvider> throttle_provider, std::unique_ptr<URLLoaderThrottleProvider> throttle_provider,
std::unique_ptr<WebSocketHandshakeThrottleProvider> std::unique_ptr<WebSocketHandshakeThrottleProvider>
...@@ -298,7 +298,7 @@ WebWorkerFetchContextImpl::CloneForNestedWorker( ...@@ -298,7 +298,7 @@ WebWorkerFetchContextImpl::CloneForNestedWorker(
ServiceWorkerProviderContext* service_worker_provider_context, ServiceWorkerProviderContext* service_worker_provider_context,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater, pending_subresource_loader_updater,
scoped_refptr<base::SingleThreadTaskRunner> task_runner) { scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
DCHECK(base::FeatureList::IsEnabled(blink::features::kPlzDedicatedWorker)); DCHECK(base::FeatureList::IsEnabled(blink::features::kPlzDedicatedWorker));
...@@ -566,7 +566,7 @@ WebWorkerFetchContextImpl::CloneForNestedWorkerInternal( ...@@ -566,7 +566,7 @@ WebWorkerFetchContextImpl::CloneForNestedWorkerInternal(
service_worker_container_host, service_worker_container_host,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater, pending_subresource_loader_updater,
scoped_refptr<base::SingleThreadTaskRunner> task_runner) { scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
mojo::PendingRemote<blink::mojom::RendererPreferenceWatcher> mojo::PendingRemote<blink::mojom::RendererPreferenceWatcher>
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include "third_party/blink/public/mojom/blob/blob_registry.mojom.h" #include "third_party/blink/public/mojom/blob/blob_registry.mojom.h"
#include "third_party/blink/public/mojom/renderer_preference_watcher.mojom.h" #include "third_party/blink/public/mojom/renderer_preference_watcher.mojom.h"
#include "third_party/blink/public/mojom/renderer_preferences.mojom.h" #include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_container.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_container.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_object.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_object.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom.h"
#include "third_party/blink/public/mojom/worker/subresource_loader_updater.mojom.h"
#include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_string.h"
#include "third_party/blink/public/platform/web_worker_fetch_context.h" #include "third_party/blink/public/platform/web_worker_fetch_context.h"
#include "url/gurl.h" #include "url/gurl.h"
...@@ -51,7 +51,7 @@ struct NavigationResponseOverrideParameters; ...@@ -51,7 +51,7 @@ struct NavigationResponseOverrideParameters;
// service workers, ServiceWorkerFetchContextImpl class is used instead. // service workers, ServiceWorkerFetchContextImpl class is used instead.
class CONTENT_EXPORT WebWorkerFetchContextImpl class CONTENT_EXPORT WebWorkerFetchContextImpl
: public blink::WebWorkerFetchContext, : public blink::WebWorkerFetchContext,
public blink::mojom::ServiceWorkerSubresourceLoaderUpdater, public blink::mojom::SubresourceLoaderUpdater,
public blink::mojom::ServiceWorkerWorkerClient, public blink::mojom::ServiceWorkerWorkerClient,
public blink::mojom::RendererPreferenceWatcher { public blink::mojom::RendererPreferenceWatcher {
public: public:
...@@ -81,7 +81,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl ...@@ -81,7 +81,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> std::unique_ptr<network::SharedURLLoaderFactoryInfo>
fallback_factory_info, fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater); pending_subresource_loader_updater);
// Clones this fetch context for a nested worker. // Clones this fetch context for a nested worker.
...@@ -97,7 +97,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl ...@@ -97,7 +97,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> std::unique_ptr<network::SharedURLLoaderFactoryInfo>
fallback_factory_info, fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater, pending_subresource_loader_updater,
scoped_refptr<base::SingleThreadTaskRunner> task_runner); scoped_refptr<base::SingleThreadTaskRunner> task_runner);
...@@ -194,7 +194,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl ...@@ -194,7 +194,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> std::unique_ptr<network::SharedURLLoaderFactoryInfo>
fallback_factory_info, fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater, pending_subresource_loader_updater,
std::unique_ptr<URLLoaderThrottleProvider> throttle_provider, std::unique_ptr<URLLoaderThrottleProvider> throttle_provider,
std::unique_ptr<WebSocketHandshakeThrottleProvider> std::unique_ptr<WebSocketHandshakeThrottleProvider>
...@@ -214,7 +214,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl ...@@ -214,7 +214,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl
std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info, std::unique_ptr<network::SharedURLLoaderFactoryInfo> loader_factory_info,
std::unique_ptr<network::SharedURLLoaderFactoryInfo> std::unique_ptr<network::SharedURLLoaderFactoryInfo>
fallback_factory_info, fallback_factory_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater, pending_subresource_loader_updater,
scoped_refptr<base::SingleThreadTaskRunner> task_runner); scoped_refptr<base::SingleThreadTaskRunner> task_runner);
...@@ -226,7 +226,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl ...@@ -226,7 +226,7 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl
// controlled by a service worker. // controlled by a service worker.
void ResetServiceWorkerURLLoaderFactory(); void ResetServiceWorkerURLLoaderFactory();
// Implements blink::mojom::ServiceWorkerSubresourceLoaderUpdater. // Implements blink::mojom::SubresourceLoaderUpdater.
void UpdateSubresourceLoaderFactories( void UpdateSubresourceLoaderFactories(
std::unique_ptr<blink::URLLoaderFactoryBundleInfo> std::unique_ptr<blink::URLLoaderFactoryBundleInfo>
subresource_loader_factories) override; subresource_loader_factories) override;
...@@ -291,9 +291,9 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl ...@@ -291,9 +291,9 @@ class CONTENT_EXPORT WebWorkerFetchContextImpl
// loaders via Host/TrackedChildURLLoaderFactoryBundle. For shared workers, // loaders via Host/TrackedChildURLLoaderFactoryBundle. For shared workers,
// the renderer process detects the crash, and terminates the worker instead // the renderer process detects the crash, and terminates the worker instead
// of recovery. // of recovery.
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater_; pending_subresource_loader_updater_;
mojo::Receiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::Receiver<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater_{this}; subresource_loader_updater_{this};
// Initialized on the worker thread when InitializeOnWorkerThread() is called. // Initialized on the worker thread when InitializeOnWorkerThread() is called.
......
...@@ -107,7 +107,7 @@ ServiceWorkerContextClient::ServiceWorkerContextClient( ...@@ -107,7 +107,7 @@ ServiceWorkerContextClient::ServiceWorkerContextClient(
mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher> mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher>
preference_watcher_receiver, preference_watcher_receiver,
std::unique_ptr<blink::URLLoaderFactoryBundleInfo> subresource_loaders, std::unique_ptr<blink::URLLoaderFactoryBundleInfo> subresource_loaders,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater, subresource_loader_updater,
const GURL& script_url_to_skip_throttling, const GURL& script_url_to_skip_throttling,
scoped_refptr<base::SingleThreadTaskRunner> initiator_thread_task_runner) scoped_refptr<base::SingleThreadTaskRunner> initiator_thread_task_runner)
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
#include "third_party/blink/public/mojom/worker/subresource_loader_updater.mojom.h"
#include "third_party/blink/public/platform/modules/service_worker/web_service_worker_error.h" #include "third_party/blink/public/platform/modules/service_worker/web_service_worker_error.h"
#include "third_party/blink/public/web/modules/service_worker/web_service_worker_context_client.h" #include "third_party/blink/public/web/modules/service_worker/web_service_worker_context_client.h"
#include "third_party/blink/public/web/modules/service_worker/web_service_worker_context_proxy.h" #include "third_party/blink/public/web/modules/service_worker/web_service_worker_context_proxy.h"
...@@ -103,7 +104,7 @@ class CONTENT_EXPORT ServiceWorkerContextClient ...@@ -103,7 +104,7 @@ class CONTENT_EXPORT ServiceWorkerContextClient
mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher> mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher>
preference_watcher_receiver, preference_watcher_receiver,
std::unique_ptr<blink::URLLoaderFactoryBundleInfo> subresource_loaders, std::unique_ptr<blink::URLLoaderFactoryBundleInfo> subresource_loaders,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater, subresource_loader_updater,
const GURL& script_url_to_skip_throttling, const GURL& script_url_to_skip_throttling,
scoped_refptr<base::SingleThreadTaskRunner> initiator_thread_task_runner); scoped_refptr<base::SingleThreadTaskRunner> initiator_thread_task_runner);
...@@ -223,7 +224,7 @@ class CONTENT_EXPORT ServiceWorkerContextClient ...@@ -223,7 +224,7 @@ class CONTENT_EXPORT ServiceWorkerContextClient
pending_service_worker_receiver_; pending_service_worker_receiver_;
mojo::PendingReceiver<blink::mojom::ControllerServiceWorker> mojo::PendingReceiver<blink::mojom::ControllerServiceWorker>
controller_receiver_; controller_receiver_;
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater_; pending_subresource_loader_updater_;
// This is bound on the initiator thread. // This is bound on the initiator thread.
......
...@@ -32,7 +32,7 @@ ServiceWorkerFetchContextImpl::ServiceWorkerFetchContextImpl( ...@@ -32,7 +32,7 @@ ServiceWorkerFetchContextImpl::ServiceWorkerFetchContextImpl(
websocket_handshake_throttle_provider, websocket_handshake_throttle_provider,
mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher> mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher>
preference_watcher_receiver, preference_watcher_receiver,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater) pending_subresource_loader_updater)
: renderer_preferences_(renderer_preferences), : renderer_preferences_(renderer_preferences),
worker_script_url_(worker_script_url), worker_script_url_(worker_script_url),
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "third_party/blink/public/mojom/renderer_preference_watcher.mojom.h" #include "third_party/blink/public/mojom/renderer_preference_watcher.mojom.h"
#include "third_party/blink/public/mojom/renderer_preferences.mojom.h" #include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h"
#include "third_party/blink/public/mojom/worker/subresource_loader_updater.mojom.h"
#include "third_party/blink/public/platform/web_worker_fetch_context.h" #include "third_party/blink/public/platform/web_worker_fetch_context.h"
#include "url/gurl.h" #include "url/gurl.h"
...@@ -22,7 +23,7 @@ class WebSocketHandshakeThrottleProvider; ...@@ -22,7 +23,7 @@ class WebSocketHandshakeThrottleProvider;
class CONTENT_EXPORT ServiceWorkerFetchContextImpl final class CONTENT_EXPORT ServiceWorkerFetchContextImpl final
: public blink::WebWorkerFetchContext, : public blink::WebWorkerFetchContext,
public blink::mojom::ServiceWorkerSubresourceLoaderUpdater, public blink::mojom::SubresourceLoaderUpdater,
public blink::mojom::RendererPreferenceWatcher { public blink::mojom::RendererPreferenceWatcher {
public: public:
// |url_loader_factory_info| is used for regular loads from the service worker // |url_loader_factory_info| is used for regular loads from the service worker
...@@ -48,7 +49,7 @@ class CONTENT_EXPORT ServiceWorkerFetchContextImpl final ...@@ -48,7 +49,7 @@ class CONTENT_EXPORT ServiceWorkerFetchContextImpl final
websocket_handshake_throttle_provider, websocket_handshake_throttle_provider,
mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher> mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher>
preference_watcher_receiver, preference_watcher_receiver,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater); pending_subresource_loader_updater);
// blink::WebWorkerFetchContext implementation: // blink::WebWorkerFetchContext implementation:
...@@ -108,14 +109,14 @@ class CONTENT_EXPORT ServiceWorkerFetchContextImpl final ...@@ -108,14 +109,14 @@ class CONTENT_EXPORT ServiceWorkerFetchContextImpl final
mojo::Receiver<blink::mojom::RendererPreferenceWatcher> mojo::Receiver<blink::mojom::RendererPreferenceWatcher>
preference_watcher_receiver_{this}; preference_watcher_receiver_{this};
mojo::Receiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::Receiver<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater_{this}; subresource_loader_updater_{this};
// These mojo objects are kept while starting up the worker thread. Valid // These mojo objects are kept while starting up the worker thread. Valid
// until InitializeOnWorkerThread(). // until InitializeOnWorkerThread().
mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher> mojo::PendingReceiver<blink::mojom::RendererPreferenceWatcher>
preference_watcher_pending_receiver_; preference_watcher_pending_receiver_;
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater_; pending_subresource_loader_updater_;
// This is owned by ThreadedMessagingProxyBase on the main thread. // This is owned by ThreadedMessagingProxyBase on the main thread.
......
...@@ -141,7 +141,7 @@ void DedicatedWorkerHostFactoryClient::OnScriptLoadStarted( ...@@ -141,7 +141,7 @@ void DedicatedWorkerHostFactoryClient::OnScriptLoadStarted(
blink::mojom::WorkerMainScriptLoadParamsPtr main_script_load_params, blink::mojom::WorkerMainScriptLoadParamsPtr main_script_load_params,
std::unique_ptr<blink::URLLoaderFactoryBundleInfo> std::unique_ptr<blink::URLLoaderFactoryBundleInfo>
subresource_loader_factory_bundle_info, subresource_loader_factory_bundle_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater, subresource_loader_updater,
blink::mojom::ControllerServiceWorkerInfoPtr controller_info) { blink::mojom::ControllerServiceWorkerInfoPtr controller_info) {
DCHECK(base::FeatureList::IsEnabled(blink::features::kPlzDedicatedWorker)); DCHECK(base::FeatureList::IsEnabled(blink::features::kPlzDedicatedWorker));
......
...@@ -76,7 +76,7 @@ class DedicatedWorkerHostFactoryClient final ...@@ -76,7 +76,7 @@ class DedicatedWorkerHostFactoryClient final
blink::mojom::WorkerMainScriptLoadParamsPtr main_script_load_params, blink::mojom::WorkerMainScriptLoadParamsPtr main_script_load_params,
std::unique_ptr<blink::URLLoaderFactoryBundleInfo> std::unique_ptr<blink::URLLoaderFactoryBundleInfo>
subresource_loader_factory_bundle_info, subresource_loader_factory_bundle_info,
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
subresource_loader_updater, subresource_loader_updater,
blink::mojom::ControllerServiceWorkerInfoPtr controller_info) override; blink::mojom::ControllerServiceWorkerInfoPtr controller_info) override;
void OnScriptLoadStartFailed() override; void OnScriptLoadStartFailed() override;
...@@ -85,7 +85,7 @@ class DedicatedWorkerHostFactoryClient final ...@@ -85,7 +85,7 @@ class DedicatedWorkerHostFactoryClient final
blink::WebDedicatedWorker* worker_; blink::WebDedicatedWorker* worker_;
scoped_refptr<ChildURLLoaderFactoryBundle> subresource_loader_factory_bundle_; scoped_refptr<ChildURLLoaderFactoryBundle> subresource_loader_factory_bundle_;
mojo::PendingReceiver<blink::mojom::ServiceWorkerSubresourceLoaderUpdater> mojo::PendingReceiver<blink::mojom::SubresourceLoaderUpdater>
pending_subresource_loader_updater_; pending_subresource_loader_updater_;
scoped_refptr<ServiceWorkerProviderContext> service_worker_provider_context_; scoped_refptr<ServiceWorkerProviderContext> service_worker_provider_context_;
......
...@@ -143,6 +143,7 @@ mojom("mojom_platform") { ...@@ -143,6 +143,7 @@ mojom("mojom_platform") {
"worker/shared_worker_creation_context_type.mojom", "worker/shared_worker_creation_context_type.mojom",
"worker/shared_worker_host.mojom", "worker/shared_worker_host.mojom",
"worker/shared_worker_info.mojom", "worker/shared_worker_info.mojom",
"worker/subresource_loader_updater.mojom",
"worker/worker_content_settings_proxy.mojom", "worker/worker_content_settings_proxy.mojom",
"worker/worker_main_script_load_params.mojom", "worker/worker_main_script_load_params.mojom",
] ]
......
...@@ -10,6 +10,7 @@ import "mojo/public/mojom/base/unguessable_token.mojom"; ...@@ -10,6 +10,7 @@ import "mojo/public/mojom/base/unguessable_token.mojom";
import "services/network/public/mojom/url_loader_factory.mojom"; import "services/network/public/mojom/url_loader_factory.mojom";
import "third_party/blink/public/mojom/devtools/console_message.mojom"; import "third_party/blink/public/mojom/devtools/console_message.mojom";
import "third_party/blink/public/mojom/devtools/devtools_agent.mojom"; import "third_party/blink/public/mojom/devtools/devtools_agent.mojom";
import "third_party/blink/public/mojom/worker/subresource_loader_updater.mojom";
import "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom"; import "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom";
import "third_party/blink/public/mojom/renderer_preference_watcher.mojom"; import "third_party/blink/public/mojom/renderer_preference_watcher.mojom";
import "third_party/blink/public/mojom/renderer_preferences.mojom"; import "third_party/blink/public/mojom/renderer_preferences.mojom";
...@@ -110,11 +111,8 @@ struct EmbeddedWorkerStartParams { ...@@ -110,11 +111,8 @@ struct EmbeddedWorkerStartParams {
// loader factory can't load. // loader factory can't load.
URLLoaderFactoryBundle subresource_loader_factories; URLLoaderFactoryBundle subresource_loader_factories;
// Another interface to talk to the service worker from the browser process // Used for updating subresource loaders after NetworkService crash etc.
// to update WorkerFetchContext. See the comment of pending_receiver<SubresourceLoaderUpdater> subresource_loader_updater;
// ServiceWorkerSubresourceLoaderUpdater why there are two interfaces.
pending_receiver<ServiceWorkerSubresourceLoaderUpdater>
subresource_loader_updater;
}; };
// Holds timing information about the start worker sequence for UMA. // Holds timing information about the start worker sequence for UMA.
......
...@@ -12,7 +12,6 @@ import "services/network/public/mojom/url_loader_factory.mojom"; ...@@ -12,7 +12,6 @@ import "services/network/public/mojom/url_loader_factory.mojom";
import "third_party/blink/public/mojom/background_fetch/background_fetch.mojom"; import "third_party/blink/public/mojom/background_fetch/background_fetch.mojom";
import "third_party/blink/public/mojom/devtools/console_message.mojom"; import "third_party/blink/public/mojom/devtools/console_message.mojom";
import "third_party/blink/public/mojom/fetch/fetch_api_response.mojom"; import "third_party/blink/public/mojom/fetch/fetch_api_response.mojom";
import "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom";
import "third_party/blink/public/mojom/messaging/transferable_message.mojom"; import "third_party/blink/public/mojom/messaging/transferable_message.mojom";
import "third_party/blink/public/mojom/notifications/notification.mojom"; import "third_party/blink/public/mojom/notifications/notification.mojom";
import "third_party/blink/public/mojom/payments/payment_app.mojom"; import "third_party/blink/public/mojom/payments/payment_app.mojom";
...@@ -286,22 +285,3 @@ interface ServiceWorker { ...@@ -286,22 +285,3 @@ interface ServiceWorker {
// Adds a message to DevTools console which is associated with this worker. // Adds a message to DevTools console which is associated with this worker.
AddMessageToConsole(ConsoleMessageLevel level, string message); AddMessageToConsole(ConsoleMessageLevel level, string message);
}; };
// This is another interface for talking to a running service worker in
// addition to the ServiceWorker interface defined above. The reason we have two
// interfaces is that implementations of these two interfaces live in different
// places (one in blink and the other in content). Ideally these two interfaces
// should be merged but we separate them to avoid cumbersome type conversions
// between blink and content.
// TODO(nhiroki): Rename this to SubresourceLoaderUpdater, and move it to the
// loader mojom directory as this is also used for dedicated workers.
interface ServiceWorkerSubresourceLoaderUpdater {
// Provides the worker an updated |subresource_loader_factories|.
//
// Pushes updated set of subresource URL loader factories to the worker
// (for example, after DevTools network interception has been enabled).
// Note this does not affect the script loader factory, whose
// implementation lives in the browser and may be updated there.
UpdateSubresourceLoaderFactories(
URLLoaderFactoryBundle subresource_loader_factories);
};
...@@ -9,11 +9,11 @@ import "services/service_manager/public/mojom/interface_provider.mojom"; ...@@ -9,11 +9,11 @@ import "services/service_manager/public/mojom/interface_provider.mojom";
import "third_party/blink/public/mojom/blob/blob_url_store.mojom"; import "third_party/blink/public/mojom/blob/blob_url_store.mojom";
import "third_party/blink/public/mojom/browser_interface_broker.mojom"; import "third_party/blink/public/mojom/browser_interface_broker.mojom";
import "third_party/blink/public/mojom/loader/fetch_client_settings_object.mojom"; import "third_party/blink/public/mojom/loader/fetch_client_settings_object.mojom";
import "third_party/blink/public/mojom/worker/subresource_loader_updater.mojom";
import "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom"; import "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom";
import "third_party/blink/public/mojom/worker/dedicated_worker_host.mojom"; import "third_party/blink/public/mojom/worker/dedicated_worker_host.mojom";
import "third_party/blink/public/mojom/worker/worker_main_script_load_params.mojom"; import "third_party/blink/public/mojom/worker/worker_main_script_load_params.mojom";
import "third_party/blink/public/mojom/service_worker/controller_service_worker.mojom"; import "third_party/blink/public/mojom/service_worker/controller_service_worker.mojom";
import "third_party/blink/public/mojom/service_worker/service_worker.mojom";
import "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom"; import "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom";
import "url/mojom/origin.mojom"; import "url/mojom/origin.mojom";
import "url/mojom/url.mojom"; import "url/mojom/url.mojom";
...@@ -58,8 +58,7 @@ interface DedicatedWorkerHostFactoryClient { ...@@ -58,8 +58,7 @@ interface DedicatedWorkerHostFactoryClient {
URLLoaderFactoryBundle subresource_loader_factories, URLLoaderFactoryBundle subresource_loader_factories,
// Used for updating subresource loaders after NetworkService crash. // Used for updating subresource loaders after NetworkService crash.
pending_receiver<ServiceWorkerSubresourceLoaderUpdater> pending_receiver<SubresourceLoaderUpdater> subresource_loader_updater,
subresource_loader_updater,
// Used to make fetches from the worker go through the controller service // Used to make fetches from the worker go through the controller service
// worker. This is null when there're no controller service worker. // worker. This is null when there're no controller service worker.
......
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
module blink.mojom;
import "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom";
// An interface for pushing updated subresource loader factories to workers in
// renderers, for example, after Network Service crashes or DevTools network
// interception is enabled/disabled.
interface SubresourceLoaderUpdater {
// Pushes updated set of subresource URL loader factories to a renderer.
UpdateSubresourceLoaderFactories(
URLLoaderFactoryBundle subresource_loader_factories);
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment