Index: content/browser/renderer_host/render_process_host_impl.cc |
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
index 9986ff6686d9b1f4b136e33816a1a20056bc5b80..b8576aa4dc014b0c26c9ec676b28f1334ec46a86 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -141,6 +141,7 @@ |
#include "content/common/service_manager/service_manager_connection_impl.h" |
#include "content/common/site_isolation_policy.h" |
#include "content/common/view_messages.h" |
+#include "content/common/worker_fetch_context_factory.mojom.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/content_browser_client.h" |
@@ -178,6 +179,7 @@ |
#include "media/media_features.h" |
#include "mojo/edk/embedder/embedder.h" |
#include "mojo/public/cpp/bindings/associated_interface_ptr.h" |
+#include "mojo/public/cpp/bindings/strong_binding.h" |
#include "net/url_request/url_request_context_getter.h" |
#include "ppapi/features/features.h" |
#include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" |
@@ -471,6 +473,50 @@ void ForwardShapeDetectionRequest(R request) { |
std::move(request)); |
} |
+class WorkerFetchContextFactoryImpl : public mojom::WorkerFetchContextFactory { |
+ public: |
+ static void Create( |
+ int render_process_id, |
+ ResourceMessageFilter* resource_message_filter, |
+ scoped_refptr<ServiceWorkerContextWrapper> service_worker_context, |
+ mojom::WorkerFetchContextFactoryRequest request) { |
+ DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch)); |
+ mojo::MakeStrongBinding( |
+ base::MakeUnique<WorkerFetchContextFactoryImpl>( |
+ render_process_id, resource_message_filter->GetWeakPtr(), |
+ std::move(service_worker_context)), |
+ std::move(request)); |
+ } |
+ WorkerFetchContextFactoryImpl( |
+ int render_process_id, |
+ base::WeakPtr<ResourceMessageFilter> resource_message_filter, |
+ scoped_refptr<ServiceWorkerContextWrapper> service_worker_context) |
+ : render_process_id_(render_process_id), |
+ url_loader_factory_binding_(resource_message_filter.get()), |
+ service_worker_context_(std::move(service_worker_context)) {} |
+ ~WorkerFetchContextFactoryImpl() override {} |
+ |
+ void CreateWorkerFetchContext( |
+ mojom::URLLoaderFactoryAssociatedRequest loader_request, |
+ mojom::ServiceWorkerClientAssociatedPtrInfo client_ptr_info, |
+ int service_worker_provider_id) override { |
+ url_loader_factory_binding_.Bind(std::move(loader_request)); |
+ service_worker_context_->BindWorkerFetchContext(render_process_id_, |
+ service_worker_provider_id, |
+ std::move(client_ptr_info)); |
+ }; |
+ void GetURLLoaderFactory( |
+ mojom::URLLoaderFactoryAssociatedRequest loader_request) override { |
+ url_loader_factory_binding_.Bind(std::move(loader_request)); |
+ } |
+ |
+ private: |
+ const int render_process_id_; |
+ mojo::AssociatedBinding<mojom::URLLoaderFactory> url_loader_factory_binding_; |
+ |
+ scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_; |
+}; |
+ |
} // namespace |
RendererMainThreadFactoryFunction g_renderer_main_thread_factory = NULL; |
@@ -1296,6 +1342,16 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { |
base::Bind(&VideoCaptureHost::Create, |
BrowserMainLoop::GetInstance()->media_stream_manager())); |
+ if (base::FeatureList::IsEnabled(features::kOffMainThreadFetch)) { |
+ scoped_refptr<ServiceWorkerContextWrapper> service_worker_context( |
+ static_cast<ServiceWorkerContextWrapper*>( |
+ storage_partition_impl_->GetServiceWorkerContext())); |
+ registry->AddInterface( |
+ base::Bind(&WorkerFetchContextFactoryImpl::Create, GetID(), |
+ base::Unretained(resource_message_filter_.get()), |
+ service_worker_context)); |
kinuko
2017/04/14 14:00:26
nit: it feels a little strange why we pass RMF as
horo
2017/04/17 15:12:04
Done.
|
+ } |
+ |
// This is to support usage of WebSockets in cases in which there is no |
// associated RenderFrame (e.g., Shared Workers). |
AddUIThreadInterface( |