Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index c3e311ad395b24cf3dea95c9f02afa1cf58c82c4..474db312a2c0474626803a5bb41e7bdd2a646161 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -16,6 +16,7 @@ |
| #include "base/debug/asan_invalid_access.h" |
| #include "base/debug/crash_logging.h" |
| #include "base/debug/dump_without_crashing.h" |
| +#include "base/feature_list.h" |
| #include "base/files/file.h" |
| #include "base/i18n/char_iterator.h" |
| #include "base/logging.h" |
| @@ -69,6 +70,7 @@ |
| #include "content/common/site_isolation_policy.h" |
| #include "content/common/swapped_out_messages.h" |
| #include "content/common/view_messages.h" |
| +#include "content/common/worker_url_loader_factory_provider.mojom.h" |
| #include "content/public/common/appcache_info.h" |
| #include "content/public/common/associated_interface_provider.h" |
| #include "content/public/common/bindings_policy.h" |
| @@ -142,6 +144,7 @@ |
| #include "content/renderer/renderer_webcolorchooser_impl.h" |
| #include "content/renderer/savable_resources.h" |
| #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" |
| +#include "content/renderer/service_worker/worker_fetch_context_impl.h" |
| #include "content/renderer/shared_worker/shared_worker_repository.h" |
| #include "content/renderer/shared_worker/websharedworker_proxy.h" |
| #include "content/renderer/skia_benchmarking_extension.h" |
| @@ -178,6 +181,7 @@ |
| #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" |
| #include "storage/common/data_element.h" |
| #include "third_party/WebKit/public/platform/FilePathConversion.h" |
| +#include "third_party/WebKit/public/platform/InterfaceProvider.h" |
| #include "third_party/WebKit/public/platform/URLConversion.h" |
| #include "third_party/WebKit/public/platform/WebCachePolicy.h" |
| #include "third_party/WebKit/public/platform/WebData.h" |
| @@ -3000,6 +3004,29 @@ RenderFrameImpl::CreateWorkerContentSettingsClientProxy() { |
| this, frame_); |
| } |
| +blink::WebWorkerFetchContext* RenderFrameImpl::CreateWorkerFetchContext() { |
| + if (!base::FeatureList::IsEnabled(features::kOffMainThreadFetch)) |
|
nhiroki
2017/04/20 04:16:06
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 = |
| + frame_->DataSource()->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; |
| +} |
| + |
| WebExternalPopupMenu* RenderFrameImpl::CreateExternalPopupMenu( |
| const WebPopupMenuInfo& popup_menu_info, |
| WebExternalPopupMenuClient* popup_menu_client) { |