| Index: trunk/src/content/browser/service_worker/embedded_worker_instance.cc
|
| ===================================================================
|
| --- trunk/src/content/browser/service_worker/embedded_worker_instance.cc (revision 272148)
|
| +++ trunk/src/content/browser/service_worker/embedded_worker_instance.cc (working copy)
|
| @@ -93,7 +93,7 @@
|
| if (worker_devtools_agent_route_id_ != MSG_ROUTING_NONE)
|
| NotifyWorkerDestroyed(process_id_, worker_devtools_agent_route_id_);
|
| if (context_ && process_id_ != -1)
|
| - context_->process_manager()->ReleaseWorkerProcess(embedded_worker_id_);
|
| + context_->process_manager()->ReleaseWorkerProcess(process_id_);
|
| registry_->RemoveWorker(process_id_, embedded_worker_id_);
|
| }
|
|
|
| @@ -117,7 +117,6 @@
|
| params->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
|
| params->pause_on_start = false;
|
| context_->process_manager()->AllocateWorkerProcess(
|
| - embedded_worker_id_,
|
| SortProcesses(possible_process_ids),
|
| script_url,
|
| base::Bind(&EmbeddedWorkerInstance::RunProcessAllocated,
|
| @@ -187,11 +186,7 @@
|
| return;
|
| }
|
| if (!instance) {
|
| - if (status == SERVICE_WORKER_OK) {
|
| - // We only have a process allocated if the status is OK.
|
| - context->process_manager()->ReleaseWorkerProcess(
|
| - params->embedded_worker_id);
|
| - }
|
| + context->process_manager()->ReleaseWorkerProcess(process_id);
|
| callback.Run(SERVICE_WORKER_ERROR_ABORT);
|
| return;
|
| }
|
| @@ -254,7 +249,7 @@
|
| if (worker_devtools_agent_route_id_ != MSG_ROUTING_NONE)
|
| NotifyWorkerDestroyed(process_id_, worker_devtools_agent_route_id_);
|
| if (context_)
|
| - context_->process_manager()->ReleaseWorkerProcess(embedded_worker_id_);
|
| + context_->process_manager()->ReleaseWorkerProcess(process_id_);
|
| status_ = STOPPED;
|
| process_id_ = -1;
|
| thread_id_ = -1;
|
|
|