Chromium Code Reviews| Index: content/renderer/shared_worker/embedded_shared_worker_stub.cc |
| diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.cc b/content/renderer/shared_worker/embedded_shared_worker_stub.cc |
| index 064d24be7902eaef58f91787c9d61b5f6441e46e..e8980aac91bd137e3a0e1e2748845c67fd0d6848 100644 |
| --- a/content/renderer/shared_worker/embedded_shared_worker_stub.cc |
| +++ b/content/renderer/shared_worker/embedded_shared_worker_stub.cc |
| @@ -7,6 +7,7 @@ |
| #include <stdint.h> |
| #include <utility> |
| +#include "base/feature_list.h" |
| #include "base/threading/thread_task_runner_handle.h" |
| #include "content/child/appcache/appcache_dispatcher.h" |
| #include "content/child/appcache/web_application_cache_host_impl.h" |
| @@ -18,12 +19,17 @@ |
| #include "content/child/shared_worker_devtools_agent.h" |
| #include "content/child/webmessageportchannel_impl.h" |
| #include "content/common/worker_messages.h" |
| +#include "content/common/worker_url_loader_factory_provider.mojom.h" |
| #include "content/public/common/appcache_info.h" |
| +#include "content/public/common/content_features.h" |
| #include "content/public/common/origin_util.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/worker_fetch_context_impl.h" |
| #include "content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h" |
| #include "ipc/ipc_message_macros.h" |
| +#include "third_party/WebKit/public/platform/InterfaceProvider.h" |
| #include "third_party/WebKit/public/platform/URLConversion.h" |
| #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" |
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.h" |
| @@ -252,6 +258,30 @@ EmbeddedSharedWorkerStub::CreateDevToolsMessageLoop() { |
| return DevToolsAgent::createMessageLoopWrapper(); |
| } |
| +blink::WebWorkerFetchContext* |
| +EmbeddedSharedWorkerStub::CreateWorkerFetchContext() { |
| + if (!base::FeatureList::IsEnabled(features::kOffMainThreadFetch)) |
|
nhiroki
2017/04/20 04:16:07
DCHECK(base::FeatureList::IsEnabled(features::kOff
horo
2017/04/20 08:35:43
Done.
|
| + return nullptr; |
| + mojom::WorkerURLLoaderFactoryProviderPtr worker_url_loader_factory_provider; |
| + RenderThreadImpl::current() |
| + ->blink_platform_impl() |
| + ->GetInterfaceProvider() |
| + ->GetInterface(mojo::MakeRequest(&worker_url_loader_factory_provider)); |
| + WorkerFetchContextImpl* worker_fetch_context = new WorkerFetchContextImpl( |
| + worker_url_loader_factory_provider.PassInterface()); |
| + blink::WebServiceWorkerNetworkProvider* web_provider = |
| + impl_->GetServiceWorkerNetworkProvider(); |
| + if (web_provider) { |
| + ServiceWorkerNetworkProvider* provider = |
| + ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider( |
| + web_provider); |
| + worker_fetch_context->SetServiceWorkerProviderID(provider->provider_id()); |
| + worker_fetch_context->SetIsControlledByServiceWorker( |
| + provider->IsControlledByServiceWorker()); |
| + } |
| + return worker_fetch_context; |
| +} |
| + |
| void EmbeddedSharedWorkerStub::Shutdown() { |
| // WebSharedWorker must be already deleted in the blink side |
| // when this is called. |