Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1932)

Unified Diff: content/renderer/shared_worker/embedded_shared_worker_stub.cc

Issue 2816403002: test all
Patch Set: fix sharedworker Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..244ca2050b61052449e4990e181b2f9967599370 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"
@@ -107,6 +113,8 @@ class WebServiceWorkerNetworkProviderImpl
return kInvalidServiceWorkerVersionId;
}
+ int GetID() override { return provider_->provider_id(); }
+
private:
std::unique_ptr<ServiceWorkerNetworkProvider> provider_;
const bool is_secure_context_;
@@ -252,6 +260,31 @@ EmbeddedSharedWorkerStub::CreateDevToolsMessageLoop() {
return DevToolsAgent::createMessageLoopWrapper();
}
+blink::WebWorkerFetchContext*
+EmbeddedSharedWorkerStub::CreateWorkerFetchContext() {
+ if (!base::FeatureList::IsEnabled(features::kOffMainThreadFetch))
+ 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());
+ worker_fetch_context->SetIsSecureContext(IsOriginSecure(url_));
+ 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.

Powered by Google App Engine
This is Rietveld 408576698