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

Unified Diff: content/browser/service_worker/service_worker_version.cc

Issue 443593002: ServiceWorker: Move worker candidate process knowledge to ServiceWorkerProcessManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 82bb676614a6004998bab5df94c7af65cbb7e780..88d8e482705452cf45e45419d774a190f9c6ecd7 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -160,11 +160,10 @@ ServiceWorkerVersionInfo ServiceWorkerVersion::GetInfo() {
}
void ServiceWorkerVersion::StartWorker(const StatusCallback& callback) {
- StartWorkerWithCandidateProcesses(std::vector<int>(), false, callback);
+ StartWorker(false, callback);
}
-void ServiceWorkerVersion::StartWorkerWithCandidateProcesses(
- const std::vector<int>& possible_process_ids,
+void ServiceWorkerVersion::StartWorker(
bool pause_after_download,
const StatusCallback& callback) {
switch (running_status()) {
@@ -183,7 +182,6 @@ void ServiceWorkerVersion::StartWorkerWithCandidateProcesses(
scope_,
script_url_,
pause_after_download,
- possible_process_ids,
base::Bind(&ServiceWorkerVersion::RunStartWorkerCallbacksOnError,
weak_factory_.GetWeakPtr()));
}
@@ -376,24 +374,11 @@ void ServiceWorkerVersion::DispatchPushEvent(const StatusCallback& callback,
}
}
-void ServiceWorkerVersion::AddProcessToWorker(int process_id) {
- embedded_worker_->AddProcessReference(process_id);
-}
-
-void ServiceWorkerVersion::RemoveProcessFromWorker(int process_id) {
- embedded_worker_->ReleaseProcessReference(process_id);
-}
-
-bool ServiceWorkerVersion::HasProcessToRun() const {
- return embedded_worker_->HasProcessToRun();
-}
-
void ServiceWorkerVersion::AddControllee(
ServiceWorkerProviderHost* provider_host) {
DCHECK(!ContainsKey(controllee_map_, provider_host));
int controllee_id = controllee_by_id_.Add(provider_host);
controllee_map_[provider_host] = controllee_id;
- AddProcessToWorker(provider_host->process_id());
if (stop_worker_timer_.IsRunning())
stop_worker_timer_.Stop();
}
@@ -404,7 +389,6 @@ void ServiceWorkerVersion::RemoveControllee(
DCHECK(found != controllee_map_.end());
controllee_by_id_.Remove(found->second);
controllee_map_.erase(found);
- RemoveProcessFromWorker(provider_host->process_id());
if (HasControllee())
return;
FOR_EACH_OBSERVER(Listener, listeners_, OnNoControllees(this));
@@ -415,16 +399,6 @@ void ServiceWorkerVersion::RemoveControllee(
ScheduleStopWorker();
}
-void ServiceWorkerVersion::AddPotentialControllee(
- ServiceWorkerProviderHost* provider_host) {
- AddProcessToWorker(provider_host->process_id());
-}
-
-void ServiceWorkerVersion::RemovePotentialControllee(
- ServiceWorkerProviderHost* provider_host) {
- RemoveProcessFromWorker(provider_host->process_id());
-}
-
void ServiceWorkerVersion::AddListener(Listener* listener) {
listeners_.AddObserver(listener);
}

Powered by Google App Engine
This is Rietveld 408576698