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

Unified Diff: content/renderer/service_worker/service_worker_context_client.cc

Issue 2637743002: ServiceWorker: remove EmbeddedWorkerMsg_StartWorker (Closed)
Patch Set: rebase Created 3 years, 11 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
« no previous file with comments | « content/renderer/service_worker/service_worker_context_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/service_worker/service_worker_context_client.cc
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index 4569c4b15c118023841d135470d3d5cf9a0d5b78..0ec4bb1b944c03bdb7e38b683deb3584332b71ef 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -397,19 +397,6 @@ ServiceWorkerContextClient::ServiceWorkerContextClient(
"PrepareWorker");
}
-ServiceWorkerContextClient::ServiceWorkerContextClient(
- int embedded_worker_id,
- int64_t service_worker_version_id,
- const GURL& service_worker_scope,
- const GURL& script_url)
- : ServiceWorkerContextClient::ServiceWorkerContextClient(
- embedded_worker_id,
- service_worker_version_id,
- service_worker_scope,
- script_url,
- mojom::ServiceWorkerEventDispatcherRequest(),
- nullptr) {}
-
ServiceWorkerContextClient::~ServiceWorkerContextClient() {}
void ServiceWorkerContextClient::OnMessageReceived(
@@ -541,10 +528,10 @@ void ServiceWorkerContextClient::workerContextStarted(
DCHECK_NE(registration_info.registration_id,
kInvalidServiceWorkerRegistrationId);
- if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) {
- DCHECK(pending_dispatcher_request_.is_pending());
- BindEventDispatcher(std::move(pending_dispatcher_request_));
- }
+ DCHECK(pending_dispatcher_request_.is_pending());
+ DCHECK(!context_->event_dispatcher_binding.is_bound());
+ context_->event_dispatcher_binding.Bind(
+ std::move(pending_dispatcher_request_));
SetRegistrationInServiceWorkerGlobalScope(registration_info, version_attrs);
@@ -1271,13 +1258,6 @@ void ServiceWorkerContextClient::OnNavigationPreloadError(
proxy_->onNavigationPreloadError(fetch_event_id, std::move(error));
}
-void ServiceWorkerContextClient::BindEventDispatcher(
- mojom::ServiceWorkerEventDispatcherRequest request) {
- DCHECK(context_);
- DCHECK(!context_->event_dispatcher_binding.is_bound());
- context_->event_dispatcher_binding.Bind(std::move(request));
-}
-
base::WeakPtr<ServiceWorkerContextClient>
ServiceWorkerContextClient::GetWeakPtr() {
DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
« no previous file with comments | « content/renderer/service_worker/service_worker_context_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698