| Index: content/renderer/service_worker/service_worker_context_client.cc
|
| diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
|
| index ab400ee2f4ffc7356a21373c6772a8e7f50a2e0a..e3f981aa07b5f1701668d8fac1a5f3b3b6cacada 100644
|
| --- a/content/renderer/service_worker/service_worker_context_client.cc
|
| +++ b/content/renderer/service_worker/service_worker_context_client.cc
|
| @@ -38,20 +38,25 @@
|
| #include "content/common/service_worker/service_worker_messages.h"
|
| #include "content/common/service_worker/service_worker_status_code.h"
|
| #include "content/common/service_worker/service_worker_utils.h"
|
| +#include "content/common/worker_fetch_context_factory.mojom.h"
|
| +#include "content/public/common/content_features.h"
|
| #include "content/public/common/push_event_payload.h"
|
| #include "content/public/common/referrer.h"
|
| #include "content/public/renderer/content_renderer_client.h"
|
| #include "content/public/renderer/document_state.h"
|
| #include "content/renderer/devtools/devtools_agent.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| +#include "content/renderer/renderer_blink_platform_impl.h"
|
| #include "content/renderer/service_worker/embedded_worker_devtools_agent.h"
|
| #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
|
| #include "content/renderer/service_worker/embedded_worker_instance_client_impl.h"
|
| +#include "content/renderer/service_worker/service_worker_fetch_context_info_impl.h"
|
| #include "content/renderer/service_worker/service_worker_type_converters.h"
|
| #include "content/renderer/service_worker/service_worker_type_util.h"
|
| #include "ipc/ipc_message.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "net/http/http_response_headers.h"
|
| +#include "third_party/WebKit/public/platform/InterfaceProvider.h"
|
| #include "third_party/WebKit/public/platform/URLConversion.h"
|
| #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
|
| #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
|
| @@ -373,7 +378,6 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
|
| DCHECK(!response_);
|
| DCHECK(!downloaded_file);
|
| response_ = base::MakeUnique<blink::WebURLResponse>();
|
| - // TODO(horo): Set report_security_info to true when DevTools is attached.
|
| const bool report_security_info = false;
|
| WebURLLoaderImpl::PopulateURLResponse(url_, response_head, response_.get(),
|
| report_security_info);
|
| @@ -976,6 +980,7 @@ ServiceWorkerContextClient::createServiceWorkerNetworkProvider() {
|
| MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_CONTROLLER,
|
| true /* is_parent_frame_secure */);
|
| provider_context_ = provider->context();
|
| + network_provider_id_ = provider->provider_id();
|
|
|
| // Tell the network provider about which version to load.
|
| provider->SetServiceWorkerVersionId(service_worker_version_id_,
|
| @@ -985,6 +990,22 @@ ServiceWorkerContextClient::createServiceWorkerNetworkProvider() {
|
| return new WebServiceWorkerNetworkProviderImpl(std::move(provider));
|
| }
|
|
|
| +blink::WebWorkerFetchContextInfo*
|
| +ServiceWorkerContextClient::createServiceWorkerFetchContextInfo() {
|
| + if (!base::FeatureList::IsEnabled(features::kOffMainThreadFetch))
|
| + return nullptr;
|
| + // TODO(horo): more simple mojo IPC. We only need URLLoaderFactory.
|
| + mojom::WorkerFetchContextFactoryPtr worker_fetch_context_factory;
|
| + RenderThreadImpl::current()
|
| + ->blink_platform_impl()
|
| + ->interfaceProvider()
|
| + ->getInterface(mojo::MakeRequest(&worker_fetch_context_factory));
|
| +
|
| + // Blink is responsible for deleting the returned object.
|
| + return new ServiceWorkerFetchContextInfoImpl(
|
| + worker_fetch_context_factory.PassInterface(), network_provider_id_);
|
| +}
|
| +
|
| blink::WebServiceWorkerProvider*
|
| ServiceWorkerContextClient::createServiceWorkerProvider() {
|
| DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread());
|
|
|