| Index: content/renderer/service_worker/worker_fetch_context_impl.cc
|
| diff --git a/content/renderer/service_worker/worker_fetch_context_impl.cc b/content/renderer/service_worker/worker_fetch_context_impl.cc
|
| index f204642e5becf0d24936b640835c7d988c7d654d..bd499266502349d11053c43a94f776133bc020af 100644
|
| --- a/content/renderer/service_worker/worker_fetch_context_impl.cc
|
| +++ b/content/renderer/service_worker/worker_fetch_context_impl.cc
|
| @@ -4,16 +4,21 @@
|
|
|
| #include "content/renderer/service_worker/worker_fetch_context_impl.h"
|
|
|
| +#include "content/child/child_thread_impl.h"
|
| #include "content/child/request_extra_data.h"
|
| #include "content/child/resource_dispatcher.h"
|
| +#include "content/child/thread_safe_sender.h"
|
| #include "content/child/web_url_loader_impl.h"
|
| +#include "content/common/frame_messages.h"
|
| #include "mojo/public/cpp/bindings/associated_binding.h"
|
| +#include "third_party/WebKit/public/platform/WebWorkerFetchContext.h"
|
|
|
| namespace content {
|
|
|
| WorkerFetchContextImpl::WorkerFetchContextImpl(
|
| mojom::WorkerURLLoaderFactoryProviderPtrInfo provider_info)
|
| - : provider_info_(std::move(provider_info)) {}
|
| + : provider_info_(std::move(provider_info)),
|
| + thread_safe_sender_(ChildThreadImpl::current()->thread_safe_sender()) {}
|
|
|
| WorkerFetchContextImpl::~WorkerFetchContextImpl() {}
|
|
|
| @@ -43,8 +48,13 @@ std::unique_ptr<blink::WebURLLoader> WorkerFetchContextImpl::CreateURLLoader() {
|
| void WorkerFetchContextImpl::WillSendRequest(blink::WebURLRequest& request) {
|
| RequestExtraData* extra_data = new RequestExtraData();
|
| extra_data->set_service_worker_provider_id(service_worker_provider_id_);
|
| + extra_data->set_render_frame_id(parent_frame_id_);
|
| + extra_data->set_initiated_in_secure_context(is_secure_context_);
|
| request.SetExtraData(extra_data);
|
|
|
| + if (data_saver_enabled_)
|
| + request.SetHTTPHeaderField("Save-Data", "on");
|
| +
|
| if (!IsControlledByServiceWorker() &&
|
| request.GetServiceWorkerMode() !=
|
| blink::WebURLRequest::ServiceWorkerMode::kNone) {
|
| @@ -58,6 +68,34 @@ bool WorkerFetchContextImpl::IsControlledByServiceWorker() const {
|
| (controller_version_id_ != kInvalidServiceWorkerVersionId);
|
| }
|
|
|
| +int64_t WorkerFetchContextImpl::ServiceWorkerID() const {
|
| + return controller_version_id_;
|
| +}
|
| +
|
| +void WorkerFetchContextImpl::DidRunContentWithCertificateErrors(
|
| + const blink::WebURL& url) {
|
| + Send(new FrameHostMsg_DidRunContentWithCertificateErrors(parent_frame_id_,
|
| + url));
|
| +}
|
| +
|
| +void WorkerFetchContextImpl::DidDisplayContentWithCertificateErrors(
|
| + const blink::WebURL& url) {
|
| + Send(new FrameHostMsg_DidDisplayContentWithCertificateErrors(parent_frame_id_,
|
| + url));
|
| +}
|
| +
|
| +bool WorkerFetchContextImpl::Send(IPC::Message* message) {
|
| + return thread_safe_sender_->Send(message);
|
| +}
|
| +
|
| +void WorkerFetchContextImpl::SetAppCacheHostID(int id) {
|
| + appcache_host_id_ = id;
|
| +}
|
| +
|
| +void WorkerFetchContextImpl::set_parent_frame_id(int id) {
|
| + parent_frame_id_ = id;
|
| +}
|
| +
|
| void WorkerFetchContextImpl::set_service_worker_provider_id(int id) {
|
| service_worker_provider_id_ = id;
|
| }
|
| @@ -66,6 +104,14 @@ void WorkerFetchContextImpl::set_is_controlled_by_service_worker(bool flag) {
|
| is_controlled_by_service_worker_ = flag;
|
| }
|
|
|
| +void WorkerFetchContextImpl::set_is_secure_context(bool flag) {
|
| + is_secure_context_ = flag;
|
| +}
|
| +
|
| +void WorkerFetchContextImpl::SetDataSaverEnabled(bool flag) {
|
| + data_saver_enabled_ = flag;
|
| +}
|
| +
|
| void WorkerFetchContextImpl::SetControllerServiceWorker(
|
| int64_t controller_version_id) {
|
| controller_version_id_ = controller_version_id;
|
|
|